diff --git a/.gitignore b/.gitignore index 59dd548..960fdd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + # Ignore rbenv files .ruby-version diff --git a/Gemfile b/Gemfile index 41541aa..6d1c709 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,11 @@ source 'https://rubygems.org' + +ruby '>= 2.2.2' + # # RAILS # -gem 'rails', '4.2.0' +gem 'rails', '4.2.7' # additional gems for rails 4 gem 'railties' diff --git a/Gemfile.lock b/Gemfile.lock index b4c911a..b0f7bd4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/activeadmin/activeadmin.git - revision: 3941e1550c4d5d8a6df51057d0517f1a51b609e4 + revision: cc178ad0ebe1b74729eeaa59d5c7ad9b82ed7837 specs: activeadmin (1.0.0.pre4) arbre (~> 1.0, >= 1.0.2) @@ -12,7 +12,7 @@ jquery-rails jquery-ui-rails kaminari (~> 0.15) - rails (>= 3.2, < 5.1) + railties (>= 3.2, < 5.1) ransack (~> 1.3) sass-rails sprockets (< 4.1) @@ -20,40 +20,40 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-action_caching (1.1.1) actionpack (>= 4.0.0, < 5.0) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.0) - activesupport (= 4.2.0) + actionview (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) + activemodel (4.2.7) + activesupport (= 4.2.7) builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) arel (~> 6.0) - activesupport (4.2.0) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -227,16 +227,16 @@ rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) + railties (= 4.2.7) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -248,9 +248,9 @@ loofah (~> 2.0) rails-observers (0.1.2) activemodel (~> 4.0) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (11.2.2) @@ -284,9 +284,9 @@ actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - swagger-docs (0.2.8) - activesupport (>= 3, < 5) - rails (>= 3, < 5) + swagger-docs (0.2.9) + activesupport (>= 3) + rails (>= 3) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref @@ -361,7 +361,7 @@ omniauth-shibboleth protected_attributes rack-test - rails (= 4.2.0) + rails (= 4.2.7) rails-observers railties recaptcha @@ -381,5 +381,8 @@ wicked_pdf yard +RUBY VERSION + ruby 2.2.2p95 + BUNDLED WITH 1.12.5 diff --git a/LICENSE.md b/LICENSE.md index ba4db2c..abce7d2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,18 +1,18 @@ -The MIT License (MIT) - -Copyright (c) 2016 University of Edinburgh, University of Glasgow & The Regents of the University of California - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -associated documentation files (the "Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT -NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2016 University of Edinburgh, University of Glasgow & The Regents of the University of California + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or +substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 67fcb25..13ddc72 100644 --- a/README.md +++ b/README.md @@ -1,103 +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 -* 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 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. +## 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 +* 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 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 9a680a0..8f67343 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,36 +1,36 @@ -= DMPRoadmap - -Roadmap is a data management planning tool, available at https://github.com/DMPRoadmap/roadmap - -Development of the Roadmap is provided by the Digital Curation Centre and the University of California Curation Center. - -The tool has four main functions -1. To help create and maintain different versions of Data Management Plans; -2. To provide useful guidance on data management issues and how to meet research funders' requirements; -3. To export attractive and useful plans in a variety of formats; -4. To allow collaborative work when creating Data Management Plans. - -== Documentation & Support - -* You can contact us by email, roadmap-l@listserv.ucop.edu, but we can only provide limited support for your installation - -== Bugs & Feature Requests - -* Bug Reports & Feature Requests: https://github.com/DMPRoadmap/roadmap/issues -* Please prefix your request with either: 'Bug:' or 'Feature:' - -== Prerequisites - -Roadmap is a Ruby on Rails application and you will need to have Ruby 2.0.0p247 or greater installed on your server and a MySQL server v5.0 or greater. - -Further details on how to install Ruby on Rails applications are available from the Ruby on Rails site, http://rubyonrails.org - -You may also find the following resources handy: - -* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html -* Ruby on Rails Tutorial Book: http://www.railstutorial.org/ - - -== Copyright - -The Roadmap project uses an MIT License. The full text of the license can be found at: https://github.com/DMPRoadmap/roadmap/blob/master/LICENSE.md += DMPRoadmap + +Roadmap is a data management planning tool, available at https://github.com/DMPRoadmap/roadmap + +Development of the Roadmap is provided by the Digital Curation Centre and the University of California Curation Center. + +The tool has four main functions +1. To help create and maintain different versions of Data Management Plans; +2. To provide useful guidance on data management issues and how to meet research funders' requirements; +3. To export attractive and useful plans in a variety of formats; +4. To allow collaborative work when creating Data Management Plans. + +== Documentation & Support + +* You can contact us by email, roadmap-l@listserv.ucop.edu, but we can only provide limited support for your installation + +== Bugs & Feature Requests + +* Bug Reports & Feature Requests: https://github.com/DMPRoadmap/roadmap/issues +* Please prefix your request with either: 'Bug:' or 'Feature:' + +== Prerequisites + +Roadmap is a Ruby on Rails application and you will need to have Ruby 2.0.0p247 or greater installed on your server and a MySQL server v5.0 or greater. + +Further details on how to install Ruby on Rails applications are available from the Ruby on Rails site, http://rubyonrails.org + +You may also find the following resources handy: + +* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html +* Ruby on Rails Tutorial Book: http://www.railstutorial.org/ + + +== Copyright + +The Roadmap project uses an MIT License. The full text of the license can be found at: https://github.com/DMPRoadmap/roadmap/blob/master/LICENSE.md diff --git a/app/admin/language.rb b/app/admin/language.rb new file mode 100644 index 0000000..777478c --- /dev/null +++ b/app/admin/language.rb @@ -0,0 +1,45 @@ +# [+Project:+] DMPonline +# [+Description:+] +# +# [+Created:+] 12/08/2016 +# [+Copyright:+] Digital Curation Centre + +ActiveAdmin.register Language do + permit_params :language_id, :name, :abbreviation, :default_language + + menu :priority => 10, :label => proc { I18n.t('admin.language') } + + index do + column I18n.t('admin.language_name'), :sortable => :name do |lang| + link_to lang.name, [:admin, lang] + end + column I18n.t('admin.language_abbreviation'), :sortable => :abbreviation do |lang| + link_to lang.abbreviation, [:admin, lang] + end + column I18n.t('admin.language_is_default'), :sortable => :default_language do |lang| + if lang[:default_language] + 'Yes' + else + 'No' + end + end + + actions + end + + show do + attributes_table do + row :name + row :abbreviation + row :default_language + row :description + end + end + + controller do + def permitted_params + params.permit! + end + end + +end \ No newline at end of file diff --git a/app/admin/org_token_permission.rb b/app/admin/org_token_permission.rb index e335d7f..4075d5cf 100644 --- a/app/admin/org_token_permission.rb +++ b/app/admin/org_token_permission.rb @@ -1,31 +1,31 @@ -ActiveAdmin.register OrgTokenPermission do - permit_params :organisation_id, :token_permission_type_id - - menu priority: 40, label: proc{ I18n.t('admin.org_token_permission')}, parent: "Api" - - index do - column I18n.t('admin.org') do |n| - link_to n.organisation, [:admin,n] - end - column I18n.t('admin.token_permission') do |n| - link_to n.token_permission_type, [:admin,n] - end - - actions - end - - show do - attributes_table do - row :organisation_id - row :token_permission_type_id - end - end - - controller do - def permitted_params - params.permit! - end - end - - -end +ActiveAdmin.register OrgTokenPermission do + permit_params :organisation_id, :token_permission_type_id + + menu priority: 40, label: proc{ I18n.t('admin.org_token_permission')}, parent: "Api" + + index do + column I18n.t('admin.org') do |n| + link_to n.organisation, [:admin,n] + end + column I18n.t('admin.token_permission') do |n| + link_to n.token_permission_type, [:admin,n] + end + + actions + end + + show do + attributes_table do + row :organisation_id + row :token_permission_type_id + end + end + + controller do + def permitted_params + params.permit! + end + end + + +end diff --git a/app/admin/token_permission_type.rb b/app/admin/token_permission_type.rb index de4aa2d..cd6e05c 100644 --- a/app/admin/token_permission_type.rb +++ b/app/admin/token_permission_type.rb @@ -1,33 +1,33 @@ -ActiveAdmin.register TokenPermissionType do - permit_params :token_type, :text_desription - - menu priority: 40, label: proc{ I18n.t('admin.token_permission_type')}, parent: "Api" - - # TODO: Find better fix for the undefined method xxx_id_eq - remove_filter :org_token_permissions - - index do - column I18n.t('admin.token_permission_type'), sortable: :token_type do |n| - link_to n.token_type, [:admin, n] - end - column I18n.t('admin.permission_description') do |n| - link_to n.text_desription, [:admin, n] - end - - actions - end - - show do - attributes_table do - row :token_type - row :text_desription - end - end - - controller do - def permitted_params - params.permit! - end - end - -end +ActiveAdmin.register TokenPermissionType do + permit_params :token_type, :text_desription + + menu priority: 40, label: proc{ I18n.t('admin.token_permission_type')}, parent: "Api" + + # TODO: Find better fix for the undefined method xxx_id_eq + remove_filter :org_token_permissions + + index do + column I18n.t('admin.token_permission_type'), sortable: :token_type do |n| + link_to n.token_type, [:admin, n] + end + column I18n.t('admin.permission_description') do |n| + link_to n.text_desription, [:admin, n] + end + + actions + end + + show do + attributes_table do + row :token_type + row :text_desription + end + end + + controller do + def permitted_params + params.permit! + end + end + +end diff --git a/app/assets/javascripts/active_admin.js b/app/assets/javascripts/active_admin.js index 3752dce..1f42d86 100644 --- a/app/assets/javascripts/active_admin.js +++ b/app/assets/javascripts/active_admin.js @@ -1 +1 @@ -#= require active_admin/base +#= require active_admin/base diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0a76459..68c3667 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,197 +1,197 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -// GO AFTER THE REQUIRES BELOW. -// -//= require jquery -//= require jquery_ujs -//= require twitter/bootstrap -//= require v1.js -//= require select2.min.js -//= require jquery.placeholder.js -//= require tinymce-jquery -//= require i18n -//= require i18n/translations - - -$( document ).ready(function() { - - $(function(){ - $('.dropdown-toggle').dropdown() - }); - - $('.accordion-body').on('show', function() { - var plus = $(this).parent().children(".accordion-heading").children(".accordion-toggle").children(".icon-plus").removeClass("icon-plus").addClass("icon-minus"); - }).on('hide', function(){ - var minus = $(this).parent().children(".accordion-heading").children(".accordion-toggle").children(".icon-minus").removeClass("icon-minus").addClass("icon-plus"); - }); - - //accordion home page - $('.accordion-home').on('show', function() { - var plus = $(this).parent().find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); - }).on('hide', function(){ - var minus = $(this).parent().find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); - }); - - //accordion project details page when project has more than 1 plan - $('.accordion-project').on('show', function() { - var plus = $(this).parent().find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); - }).on('hide', function(){ - var minus = $(this).parent().find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); - }); - - //$('#3-or-4-splash').modal(); - - $('.typeahead').select2({ - width: "element", - allowClear: true - }); - - $(".help").popover(); - - $('.has-tooltip').tooltip({ - placement: "right", - trigger: "focus" - }); - - $(".show-edit-toggle").click(function (e) { - e.preventDefault(); - - $(".edit-project").toggle(); - $(".view-project").toggle(); - }); - - $(".toggle-existing-user-access").change(function(){ - $(this).closest("form").submit(); - }); - - $("#user_email.text_field.reg-input").blur(function () { - if (validateEmail($(this).val())) { - $(this).parent().children("div").hide(); - } - else { - $(this).parent().children("div").show(); - } - }); - - $("#user_password.text_field.reg-input").blur(function () { - if ($(this).val().length >= 8) { - $(this).parent().children("div").hide(); - } - else { - $(this).parent().children("div").show(); - } - }); - - $("#user_password_confirmation.text_field.reg-input").blur(function () { - if ($(this).val() == $("#user_password.text_field.reg-input").val()) { - $(this).parent().children("div").hide(); - } - else { - $(this).parent().children("div").show(); - } - }); - - $('#user_organisation_id').on("change", function(e) { - e.preventDefault(); - var selected_org = $(this).select2("val"); - var other_orgs = $("#other-organisation-name").attr("data-orgs").split(","); - var index = $.inArray(selected_org, other_orgs); - if (index > -1) { - $("#other-organisation-name").show(); - $("#user_other_organisation").focus(); - } - else { - $("#other-organisation-name").hide(); - } - }); - - $("#other-org-link > a").click(function(e){ - e.preventDefault(); - var other_org = $("#other-organisation-name").attr("data-orgs").split(","); - $("#user_organisation_id").select2("val", other_org); - $("#other-org-link").hide(); - $("#user_organisation_id").change(); - }); - - //alert dialog for unlink Shibbileth account - $("#unlink-institutional-credentials-dialog").on("show", function(){ - $('.select2-choice').hide(); - }); - - $("#unlink-shibboleth-cancelled").click(function (){ - $("#unlink-institutional-credentials-dialog").modal("hide"); - $('.select2-choice').show(); - }); - - $("#unlink-shibboleth-confirmed").click(function (){ - $("#unlink_flag").val('true'); - $("#edit_user").submit(); - - }); - - //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"); - var n = destination.lastIndexOf('='); - destination = decodeURIComponent(destination.substring(n + 1)); - $.post('splash_logs', {destination: destination} ); - $("#3-or-4-splash").modal('hide'); - return false; - });*/ - -}); - -function validateEmail(sEmail) { - var filter = /^[a-zA-Z0-9]+[a-zA-Z0-9_.-]+[a-zA-Z0-9_-]+@[a-zA-Z0-9]+[a-zA-Z0-9.-]+[a-zA-Z0-9]+.[a-z]{2,4}$/; - if (filter.test(sEmail)) { - return true; - } - else { - return false; - } -} +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD +// GO AFTER THE REQUIRES BELOW. +// +//= require jquery +//= require jquery_ujs +//= require twitter/bootstrap +//= require v1.js +//= require select2.min.js +//= require jquery.placeholder.js +//= require tinymce-jquery +//= require i18n +//= require i18n/translations + + +$( document ).ready(function() { + + $(function(){ + $('.dropdown-toggle').dropdown() + }); + + $('.accordion-body').on('show', function() { + var plus = $(this).parent().children(".accordion-heading").children(".accordion-toggle").children(".icon-plus").removeClass("icon-plus").addClass("icon-minus"); + }).on('hide', function(){ + var minus = $(this).parent().children(".accordion-heading").children(".accordion-toggle").children(".icon-minus").removeClass("icon-minus").addClass("icon-plus"); + }); + + //accordion home page + $('.accordion-home').on('show', function() { + var plus = $(this).parent().find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); + }).on('hide', function(){ + var minus = $(this).parent().find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); + }); + + //accordion project details page when project has more than 1 plan + $('.accordion-project').on('show', function() { + var plus = $(this).parent().find(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); + }).on('hide', function(){ + var minus = $(this).parent().find(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); + }); + + //$('#3-or-4-splash').modal(); + + $('.typeahead').select2({ + width: "element", + allowClear: true + }); + + $(".help").popover(); + + $('.has-tooltip').tooltip({ + placement: "right", + trigger: "focus" + }); + + $(".show-edit-toggle").click(function (e) { + e.preventDefault(); + + $(".edit-project").toggle(); + $(".view-project").toggle(); + }); + + $(".toggle-existing-user-access").change(function(){ + $(this).closest("form").submit(); + }); + + $("#user_email.text_field.reg-input").blur(function () { + if (validateEmail($(this).val())) { + $(this).parent().children("div").hide(); + } + else { + $(this).parent().children("div").show(); + } + }); + + $("#user_password.text_field.reg-input").blur(function () { + if ($(this).val().length >= 8) { + $(this).parent().children("div").hide(); + } + else { + $(this).parent().children("div").show(); + } + }); + + $("#user_password_confirmation.text_field.reg-input").blur(function () { + if ($(this).val() == $("#user_password.text_field.reg-input").val()) { + $(this).parent().children("div").hide(); + } + else { + $(this).parent().children("div").show(); + } + }); + + $('#user_organisation_id').on("change", function(e) { + e.preventDefault(); + var selected_org = $(this).select2("val"); + var other_orgs = $("#other-organisation-name").attr("data-orgs").split(","); + var index = $.inArray(selected_org, other_orgs); + if (index > -1) { + $("#other-organisation-name").show(); + $("#user_other_organisation").focus(); + } + else { + $("#other-organisation-name").hide(); + } + }); + + $("#other-org-link > a").click(function(e){ + e.preventDefault(); + var other_org = $("#other-organisation-name").attr("data-orgs").split(","); + $("#user_organisation_id").select2("val", other_org); + $("#other-org-link").hide(); + $("#user_organisation_id").change(); + }); + + //alert dialog for unlink Shibbileth account + $("#unlink-institutional-credentials-dialog").on("show", function(){ + $('.select2-choice').hide(); + }); + + $("#unlink-shibboleth-cancelled").click(function (){ + $("#unlink-institutional-credentials-dialog").modal("hide"); + $('.select2-choice').show(); + }); + + $("#unlink-shibboleth-confirmed").click(function (){ + $("#unlink_flag").val('true'); + $("#edit_user").submit(); + + }); + + //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"); + var n = destination.lastIndexOf('='); + destination = decodeURIComponent(destination.substring(n + 1)); + $.post('splash_logs', {destination: destination} ); + $("#3-or-4-splash").modal('hide'); + return false; + });*/ + +}); + +function validateEmail(sEmail) { + var filter = /^[a-zA-Z0-9]+[a-zA-Z0-9_.-]+[a-zA-Z0-9_-]+@[a-zA-Z0-9]+[a-zA-Z0-9.-]+[a-zA-Z0-9]+.[a-z]{2,4}$/; + if (filter.test(sEmail)) { + return true; + } + else { + return false; + } +} diff --git a/app/assets/javascripts/bootstrap.min.js b/app/assets/javascripts/bootstrap.min.js index f9cbdae..dce516e 100644 --- a/app/assets/javascripts/bootstrap.min.js +++ b/app/assets/javascripts/bootstrap.min.js @@ -1,6 +1,6 @@ -/*! -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ +/*! +* Bootstrap.js by @fat & @mdo +* Copyright 2012 Twitter, Inc. +* http://www.apache.org/licenses/LICENSE-2.0.txt +*/ !function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(".dropdown-backdrop").remove(),e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||("ontouchstart"in document.documentElement&&e('
').insertBefore(e(this)).on("click",r),s.toggleClass("open")),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(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 t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),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=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
    ',item:'
    • ',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(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 d6ae5bb..a195d3f 100644 --- a/app/assets/javascripts/export_configure.js +++ b/app/assets/javascripts/export_configure.js @@ -1,108 +1,108 @@ -$(document).ready(function() { - - // Prevent the click handler from being registered multiple times. - // This is due to the buggy way this is included. - if (window['has_export_js']) - return; - - window['has_export_js'] = true; - - $.expr.filters.indeterminate = function(element) { - return $(element).prop('indeterminate'); - }; - - $("select#format").change(function(){ - if ($(this).val() == 'pdf') { - $("#pdf-format-options").show(); - $("#settings-toggle > small").show(); - } - else { - $("#pdf-format-options").hide(); - $("#settings-toggle > small").hide(); - } - }); - - $("input:checkbox, select:not(#format)").change(function(){ - $(".unsaved_changes_alert").show(); - }); - - $("select:not(#format)").change(function(){ - $(".unsaved_changes_alert").show(); - }); - - $('.check_select > legend').append(''); - - $('.btn-primary[value="Reset"]').click(function(){ - $('input:checkbox').prop('checked',true); - $("select:not(#format)").each(function(){ - $(this).val($(this).data("default")); - }); - $(".unsaved_changes_alert").hide(); - $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); - }); - - $('.btn-primary[value="Save"]').click(function(){ - var custom = false; - $("select:not(#format)").each(function(){ - if ($(this).val() != $(this).data("default")) { - custom = true; - } - }); - if (custom) { - $("#settings-toggle > small").text(I18n.t("project.settings.plans.custom_formatting")); - } - else { - $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); - } - $(".unsaved_changes_alert").hide(); - }); - - $('.check_select').each(function() { - var container = $(this), - toggle = container.find('> legend > .toggle'), - checks = container.find('> ol > li > input[type=checkbox], li > fieldset > legend > input[type=checkbox]'); - - - function checked(toggle) { - var checks = toggle.prop('checks'), - checked = checks.filter(':checked').length, - indeterminate = checks.filter(':indeterminate').length; - - return { - 'indeterminate' : ((checked > 0 && checked < checks.length) || indeterminate > 0), - 'checked' : (checked == checks.length) - }; - } - - function toggleParent(toggle) { - var parent_toggle = toggle.prop('toggle'); - - if (parent_toggle) - parent_toggle.prop(checked(parent_toggle)); - } - - checks.prop('toggle', toggle); - toggle.prop('checks', checks); - toggle.prop('id', container.find('> legend > label').prop('for')); - toggle.prop(checked(toggle)); - toggleParent(toggle); - - checks.change(function() { - toggle.prop(checked(toggle)); - toggleParent(toggle); - }); - - toggle.change(function() { - $(".unsaved_changes_alert").show(); - checks.prop({ 'checked': toggle.is(':checked'), 'indeterminate': false}); - - checks.each(function() { - var child_checks = $(this).prop('checks'); - - if (child_checks) - child_checks.prop({ 'checked': toggle.is(':checked'), 'indeterminate': toggle.is(':indeterminate') }); - - }); - }); - }); -}); +$(document).ready(function() { + + // Prevent the click handler from being registered multiple times. + // This is due to the buggy way this is included. + if (window['has_export_js']) + return; + + window['has_export_js'] = true; + + $.expr.filters.indeterminate = function(element) { + return $(element).prop('indeterminate'); + }; + + $("select#format").change(function(){ + if ($(this).val() == 'pdf') { + $("#pdf-format-options").show(); + $("#settings-toggle > small").show(); + } + else { + $("#pdf-format-options").hide(); + $("#settings-toggle > small").hide(); + } + }); + + $("input:checkbox, select:not(#format)").change(function(){ + $(".unsaved_changes_alert").show(); + }); + + $("select:not(#format)").change(function(){ + $(".unsaved_changes_alert").show(); + }); + + $('.check_select > legend').append(''); + + $('.btn-primary[value="Reset"]').click(function(){ + $('input:checkbox').prop('checked',true); + $("select:not(#format)").each(function(){ + $(this).val($(this).data("default")); + }); + $(".unsaved_changes_alert").hide(); + $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); + }); + + $('.btn-primary[value="Save"]').click(function(){ + var custom = false; + $("select:not(#format)").each(function(){ + if ($(this).val() != $(this).data("default")) { + custom = true; + } + }); + if (custom) { + $("#settings-toggle > small").text(I18n.t("project.settings.plans.custom_formatting")); + } + else { + $("#settings-toggle > small").text(I18n.t("project.settings.plans.template_formatting")); + } + $(".unsaved_changes_alert").hide(); + }); + + $('.check_select').each(function() { + var container = $(this), + toggle = container.find('> legend > .toggle'), + checks = container.find('> ol > li > input[type=checkbox], li > fieldset > legend > input[type=checkbox]'); + + + function checked(toggle) { + var checks = toggle.prop('checks'), + checked = checks.filter(':checked').length, + indeterminate = checks.filter(':indeterminate').length; + + return { + 'indeterminate' : ((checked > 0 && checked < checks.length) || indeterminate > 0), + 'checked' : (checked == checks.length) + }; + } + + function toggleParent(toggle) { + var parent_toggle = toggle.prop('toggle'); + + if (parent_toggle) + parent_toggle.prop(checked(parent_toggle)); + } + + checks.prop('toggle', toggle); + toggle.prop('checks', checks); + toggle.prop('id', container.find('> legend > label').prop('for')); + toggle.prop(checked(toggle)); + toggleParent(toggle); + + checks.change(function() { + toggle.prop(checked(toggle)); + toggleParent(toggle); + }); + + toggle.change(function() { + $(".unsaved_changes_alert").show(); + checks.prop({ 'checked': toggle.is(':checked'), 'indeterminate': false}); + + checks.each(function() { + var child_checks = $(this).prop('checks'); + + if (child_checks) + child_checks.prop({ 'checked': toggle.is(':checked'), 'indeterminate': toggle.is(':indeterminate') }); + + }); + }); + }); +}); diff --git a/app/assets/javascripts/jquery.placeholder.js b/app/assets/javascripts/jquery.placeholder.js index ebea448..78af36d 100644 --- a/app/assets/javascripts/jquery.placeholder.js +++ b/app/assets/javascripts/jquery.placeholder.js @@ -1,183 +1,183 @@ -/*! http://mths.be/placeholder v2.0.7 by @mathias */ -;(function(window, document, $) { - - var isInputSupported = 'placeholder' in document.createElement('input'); - var isTextareaSupported = 'placeholder' in document.createElement('textarea'); - var prototype = $.fn; - var valHooks = $.valHooks; - var propHooks = $.propHooks; - var hooks; - var placeholder; - - if (isInputSupported && isTextareaSupported) { - - placeholder = prototype.placeholder = function() { - return this; - }; - - placeholder.input = placeholder.textarea = true; - - } else { - - placeholder = prototype.placeholder = function() { - var $this = this; - $this - .filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]') - .not('.placeholder') - .bind({ - 'focus.placeholder': clearPlaceholder, - 'blur.placeholder': setPlaceholder - }) - .data('placeholder-enabled', true) - .trigger('blur.placeholder'); - return $this; - }; - - placeholder.input = isInputSupported; - placeholder.textarea = isTextareaSupported; - - hooks = { - 'get': function(element) { - var $element = $(element); - - var $passwordInput = $element.data('placeholder-password'); - if ($passwordInput) { - return $passwordInput[0].value; - } - - return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value; - }, - 'set': function(element, value) { - var $element = $(element); - - var $passwordInput = $element.data('placeholder-password'); - if ($passwordInput) { - return $passwordInput[0].value = value; - } - - if (!$element.data('placeholder-enabled')) { - return element.value = value; - } - if (value == '') { - element.value = value; - // Issue #56: Setting the placeholder causes problems if the element continues to have focus. - if (element != safeActiveElement()) { - // We can't use `triggerHandler` here because of dummy text/password inputs :( - setPlaceholder.call(element); - } - } else if ($element.hasClass('placeholder')) { - clearPlaceholder.call(element, true, value) || (element.value = value); - } else { - element.value = value; - } - // `set` can not return `undefined`; see http://jsapi.info/jquery/1.7.1/val#L2363 - return $element; - } - }; - - if (!isInputSupported) { - valHooks.input = hooks; - propHooks.value = hooks; - } - if (!isTextareaSupported) { - valHooks.textarea = hooks; - propHooks.value = hooks; - } - - $(function() { - // Look for forms - $(document).delegate('form', 'submit.placeholder', function() { - // Clear the placeholder values so they don't get submitted - var $inputs = $('.placeholder', this).each(clearPlaceholder); - setTimeout(function() { - $inputs.each(setPlaceholder); - }, 10); - }); - }); - - // Clear placeholder values upon page reload - $(window).bind('beforeunload.placeholder', function() { - $('.placeholder').each(function() { - this.value = ''; - }); - }); - - } - - function args(elem) { - // Return an object of element attributes - var newAttrs = {}; - var rinlinejQuery = /^jQuery\d+$/; - $.each(elem.attributes, function(i, attr) { - if (attr.specified && !rinlinejQuery.test(attr.name)) { - newAttrs[attr.name] = attr.value; - } - }); - return newAttrs; - } - - function clearPlaceholder(event, value) { - var input = this; - var $input = $(input); - if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) { - if ($input.data('placeholder-password')) { - $input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id')); - // If `clearPlaceholder` was called from `$.valHooks.input.set` - if (event === true) { - return $input[0].value = value; - } - $input.focus(); - } else { - input.value = ''; - $input.removeClass('placeholder'); - input == safeActiveElement() && input.select(); - } - } - } - - function setPlaceholder() { - var $replacement; - var input = this; - var $input = $(input); - var id = this.id; - if (input.value == '') { - if (input.type == 'password') { - if (!$input.data('placeholder-textinput')) { - try { - $replacement = $input.clone().attr({ 'type': 'text' }); - } catch(e) { - $replacement = $('').attr($.extend(args(this), { 'type': 'text' })); - } - $replacement - .removeAttr('name') - .data({ - 'placeholder-password': $input, - 'placeholder-id': id - }) - .bind('focus.placeholder', clearPlaceholder); - $input - .data({ - 'placeholder-textinput': $replacement, - 'placeholder-id': id - }) - .before($replacement); - } - $input = $input.removeAttr('id').hide().prev().attr('id', id).show(); - // Note: `$input[0] != input` now! - } - $input.addClass('placeholder'); - $input[0].value = $input.attr('placeholder'); - } else { - $input.removeClass('placeholder'); - } - } - - function safeActiveElement() { - // Avoid IE9 `document.activeElement` of death - // https://github.com/mathiasbynens/jquery-placeholder/pull/99 - try { - return document.activeElement; - } catch (err) {} - } - +/*! http://mths.be/placeholder v2.0.7 by @mathias */ +;(function(window, document, $) { + + var isInputSupported = 'placeholder' in document.createElement('input'); + var isTextareaSupported = 'placeholder' in document.createElement('textarea'); + var prototype = $.fn; + var valHooks = $.valHooks; + var propHooks = $.propHooks; + var hooks; + var placeholder; + + if (isInputSupported && isTextareaSupported) { + + placeholder = prototype.placeholder = function() { + return this; + }; + + placeholder.input = placeholder.textarea = true; + + } else { + + placeholder = prototype.placeholder = function() { + var $this = this; + $this + .filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]') + .not('.placeholder') + .bind({ + 'focus.placeholder': clearPlaceholder, + 'blur.placeholder': setPlaceholder + }) + .data('placeholder-enabled', true) + .trigger('blur.placeholder'); + return $this; + }; + + placeholder.input = isInputSupported; + placeholder.textarea = isTextareaSupported; + + hooks = { + 'get': function(element) { + var $element = $(element); + + var $passwordInput = $element.data('placeholder-password'); + if ($passwordInput) { + return $passwordInput[0].value; + } + + return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value; + }, + 'set': function(element, value) { + var $element = $(element); + + var $passwordInput = $element.data('placeholder-password'); + if ($passwordInput) { + return $passwordInput[0].value = value; + } + + if (!$element.data('placeholder-enabled')) { + return element.value = value; + } + if (value == '') { + element.value = value; + // Issue #56: Setting the placeholder causes problems if the element continues to have focus. + if (element != safeActiveElement()) { + // We can't use `triggerHandler` here because of dummy text/password inputs :( + setPlaceholder.call(element); + } + } else if ($element.hasClass('placeholder')) { + clearPlaceholder.call(element, true, value) || (element.value = value); + } else { + element.value = value; + } + // `set` can not return `undefined`; see http://jsapi.info/jquery/1.7.1/val#L2363 + return $element; + } + }; + + if (!isInputSupported) { + valHooks.input = hooks; + propHooks.value = hooks; + } + if (!isTextareaSupported) { + valHooks.textarea = hooks; + propHooks.value = hooks; + } + + $(function() { + // Look for forms + $(document).delegate('form', 'submit.placeholder', function() { + // Clear the placeholder values so they don't get submitted + var $inputs = $('.placeholder', this).each(clearPlaceholder); + setTimeout(function() { + $inputs.each(setPlaceholder); + }, 10); + }); + }); + + // Clear placeholder values upon page reload + $(window).bind('beforeunload.placeholder', function() { + $('.placeholder').each(function() { + this.value = ''; + }); + }); + + } + + function args(elem) { + // Return an object of element attributes + var newAttrs = {}; + var rinlinejQuery = /^jQuery\d+$/; + $.each(elem.attributes, function(i, attr) { + if (attr.specified && !rinlinejQuery.test(attr.name)) { + newAttrs[attr.name] = attr.value; + } + }); + return newAttrs; + } + + function clearPlaceholder(event, value) { + var input = this; + var $input = $(input); + if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) { + if ($input.data('placeholder-password')) { + $input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id')); + // If `clearPlaceholder` was called from `$.valHooks.input.set` + if (event === true) { + return $input[0].value = value; + } + $input.focus(); + } else { + input.value = ''; + $input.removeClass('placeholder'); + input == safeActiveElement() && input.select(); + } + } + } + + function setPlaceholder() { + var $replacement; + var input = this; + var $input = $(input); + var id = this.id; + if (input.value == '') { + if (input.type == 'password') { + if (!$input.data('placeholder-textinput')) { + try { + $replacement = $input.clone().attr({ 'type': 'text' }); + } catch(e) { + $replacement = $('').attr($.extend(args(this), { 'type': 'text' })); + } + $replacement + .removeAttr('name') + .data({ + 'placeholder-password': $input, + 'placeholder-id': id + }) + .bind('focus.placeholder', clearPlaceholder); + $input + .data({ + 'placeholder-textinput': $replacement, + 'placeholder-id': id + }) + .before($replacement); + } + $input = $input.removeAttr('id').hide().prev().attr('id', id).show(); + // Note: `$input[0] != input` now! + } + $input.addClass('placeholder'); + $input[0].value = $input.attr('placeholder'); + } else { + $input.removeClass('placeholder'); + } + } + + function safeActiveElement() { + // Avoid IE9 `document.activeElement` of death + // https://github.com/mathiasbynens/jquery-placeholder/pull/99 + try { + return document.activeElement; + } catch (err) {} + } + }(this, document, jQuery)); \ No newline at end of file diff --git a/app/assets/javascripts/jquery.tablesorter.js b/app/assets/javascripts/jquery.tablesorter.js index e8e2323..9b58731 100644 --- a/app/assets/javascripts/jquery.tablesorter.js +++ b/app/assets/javascripts/jquery.tablesorter.js @@ -1,1031 +1,1031 @@ -/* - * - * TableSorter 2.0 - Client-side table sorting with ease! - * Version 2.0.5b - * @requires jQuery v1.2.3 - * - * Copyright (c) 2007 Christian Bach - * Examples and docs at: http://tablesorter.com - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ -/** - * - * @description Create a sortable table with multi-column sorting capabilitys - * - * @example $('table').tablesorter(); - * @desc Create a simple tablesorter interface. - * - * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] }); - * @desc Create a tablesorter interface and sort on the first and secound column column headers. - * - * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } }); - * - * @desc Create a tablesorter interface and disableing the first and second column headers. - * - * - * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } }); - * - * @desc Create a tablesorter interface and set a column parser for the first - * and second column. - * - * - * @param Object - * settings An object literal containing key/value pairs to provide - * optional settings. - * - * - * @option String cssHeader (optional) A string of the class name to be appended - * to sortable tr elements in the thead of the table. Default value: - * "header" - * - * @option String cssAsc (optional) A string of the class name to be appended to - * sortable tr elements in the thead on a ascending sort. Default value: - * "headerSortUp" - * - * @option String cssDesc (optional) A string of the class name to be appended - * to sortable tr elements in the thead on a descending sort. Default - * value: "headerSortDown" - * - * @option String sortInitialOrder (optional) A string of the inital sorting - * order can be asc or desc. Default value: "asc" - * - * @option String sortMultisortKey (optional) A string of the multi-column sort - * key. Default value: "shiftKey" - * - * @option String textExtraction (optional) A string of the text-extraction - * method to use. For complex html structures inside td cell set this - * option to "complex", on large tables the complex option can be slow. - * Default value: "simple" - * - * @option Object headers (optional) An array containing the forces sorting - * rules. This option let's you specify a default sorting rule. Default - * value: null - * - * @option Array sortList (optional) An array containing the forces sorting - * rules. This option let's you specify a default sorting rule. Default - * value: null - * - * @option Array sortForce (optional) An array containing forced sorting rules. - * This option let's you specify a default sorting rule, which is - * prepended to user-selected rules. Default value: null - * - * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever - * to use String.localeCampare method or not. Default set to true. - * - * - * @option Array sortAppend (optional) An array containing forced sorting rules. - * This option let's you specify a default sorting rule, which is - * appended to user-selected rules. Default value: null - * - * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter - * should apply fixed widths to the table columns. This is usefull when - * using the pager companion plugin. This options requires the dimension - * jquery plugin. Default value: false - * - * @option Boolean cancelSelection (optional) Boolean flag indicating if - * tablesorter should cancel selection of the table headers text. - * Default value: true - * - * @option Boolean debug (optional) Boolean flag indicating if tablesorter - * should display debuging information usefull for development. - * - * @type jQuery - * - * @name tablesorter - * - * @cat Plugins/Tablesorter - * - * @author Christian Bach/christian.bach@polyester.se - */ - -(function ($) { - $.extend({ - tablesorter: new - function () { - - var parsers = [], - widgets = []; - - this.defaults = { - cssHeader: "header", - cssAsc: "headerSortUp", - cssDesc: "headerSortDown", - cssChildRow: "expand-child", - sortInitialOrder: "asc", - sortMultiSortKey: "shiftKey", - sortForce: null, - sortAppend: null, - sortLocaleCompare: true, - textExtraction: "simple", - parsers: {}, widgets: [], - widgetZebra: { - css: ["even", "odd"] - }, headers: {}, widthFixed: false, - cancelSelection: true, - sortList: [], - headerList: [], - dateFormat: "us", - decimal: '/\.|\,/g', - onRenderHeader: null, - selectorHeaders: 'thead th', - debug: false - }; - - /* debuging utils */ - - function benchmark(s, d) { - log(s + "," + (new Date().getTime() - d.getTime()) + "ms"); - } - - this.benchmark = benchmark; - - function log(s) { - if (typeof console != "undefined" && typeof console.debug != "undefined") { - console.log(s); - } else { - alert(s); - } - } - - /* parsers utils */ - - function buildParserCache(table, $headers) { - - if (table.config.debug) { - var parsersDebug = ""; - } - - if (table.tBodies.length == 0) return; // In the case of empty tables - var rows = table.tBodies[0].rows; - - if (rows[0]) { - - var list = [], - cells = rows[0].cells, - l = cells.length; - - for (var i = 0; i < l; i++) { - - var p = false; - - if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) { - - p = getParserById($($headers[i]).metadata().sorter); - - } else if ((table.config.headers[i] && table.config.headers[i].sorter)) { - - p = getParserById(table.config.headers[i].sorter); - } - if (!p) { - - p = detectParserForColumn(table, rows, -1, i); - } - - if (table.config.debug) { - parsersDebug += "column:" + i + " parser:" + p.id + "\n"; - } - - list.push(p); - } - } - - if (table.config.debug) { - log(parsersDebug); - } - - return list; - }; - - function detectParserForColumn(table, rows, rowIndex, cellIndex) { - var l = parsers.length, - node = false, - nodeValue = false, - keepLooking = true; - while (nodeValue == '' && keepLooking) { - rowIndex++; - if (rows[rowIndex]) { - node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex); - nodeValue = trimAndGetNodeText(table.config, node); - if (table.config.debug) { - log('Checking if value was empty on row:' + rowIndex); - } - } else { - keepLooking = false; - } - } - for (var i = 1; i < l; i++) { - if (parsers[i].is(nodeValue, table, node)) { - return parsers[i]; - } - } - // 0 is always the generic parser (text) - return parsers[0]; - } - - function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) { - return rows[rowIndex].cells[cellIndex]; - } - - function trimAndGetNodeText(config, node) { - return $.trim(getElementText(config, node)); - } - - function getParserById(name) { - var l = parsers.length; - for (var i = 0; i < l; i++) { - if (parsers[i].id.toLowerCase() == name.toLowerCase()) { - return parsers[i]; - } - } - return false; - } - - /* utils */ - - function buildCache(table) { - - if (table.config.debug) { - var cacheTime = new Date(); - } - - var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0, - totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0, - parsers = table.config.parsers, - cache = { - row: [], - normalized: [] - }; - - for (var i = 0; i < totalRows; ++i) { - - /** Add the table data to main data array */ - var c = $(table.tBodies[0].rows[i]), - cols = []; - - // if this is a child row, add it to the last row's children and - // continue to the next row - if (c.hasClass(table.config.cssChildRow)) { - cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c); - // go to the next for loop - continue; - } - - cache.row.push(c); - - for (var j = 0; j < totalCells; ++j) { - cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j])); - } - - cols.push(cache.normalized.length); // add position for rowCache - cache.normalized.push(cols); - cols = null; - }; - - if (table.config.debug) { - benchmark("Building cache for " + totalRows + " rows:", cacheTime); - } - - return cache; - }; - - function getElementText(config, node) { - - var text = ""; - - if (!node) return ""; - - if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false; - - if (config.textExtraction == "simple") { - if (config.supportsTextContent) { - text = node.textContent; - } else { - if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) { - text = node.childNodes[0].innerHTML; - } else { - text = node.innerHTML; - } - } - } else { - if (typeof(config.textExtraction) == "function") { - text = config.textExtraction(node); - } else { - text = $(node).text(); - } - } - return text; - } - - function appendToTable(table, cache) { - - if (table.config.debug) { - var appendTime = new Date() - } - - var c = cache, - r = c.row, - n = c.normalized, - totalRows = n.length, - checkCell = (n[0].length - 1), - tableBody = $(table.tBodies[0]), - rows = []; - - - for (var i = 0; i < totalRows; i++) { - var pos = n[i][checkCell]; - - rows.push(r[pos]); - - if (!table.config.appender) { - - //var o = ; - var l = r[pos].length; - for (var j = 0; j < l; j++) { - tableBody[0].appendChild(r[pos][j]); - } - - // - } - } - - - - if (table.config.appender) { - - table.config.appender(table, rows); - } - - rows = null; - - if (table.config.debug) { - benchmark("Rebuilt table:", appendTime); - } - - // apply table widgets - applyWidget(table); - - // trigger sortend - setTimeout(function () { - $(table).trigger("sortEnd"); - }, 0); - - }; - - function buildHeaders(table) { - - if (table.config.debug) { - var time = new Date(); - } - - var meta = ($.metadata) ? true : false; - - var header_index = computeTableHeaderCellIndexes(table); - - $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) { - - this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex]; - // this.column = index; - this.order = formatSortingOrder(table.config.sortInitialOrder); - - - this.count = this.order; - - if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true; - if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index); - - if (!this.sortDisabled) { - var $th = $(this).addClass(table.config.cssHeader); - if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th); - } - - // add cell to headerList - table.config.headerList[index] = this; - }); - - if (table.config.debug) { - benchmark("Built headers:", time); - log($tableHeaders); - } - - return $tableHeaders; - - }; - - // from: - // http://www.javascripttoolbox.com/lib/table/examples.php - // http://www.javascripttoolbox.com/temp/table_cellindex.html - - - function computeTableHeaderCellIndexes(t) { - var matrix = []; - var lookup = {}; - var thead = t.getElementsByTagName('THEAD')[0]; - var trs = thead.getElementsByTagName('TR'); - - for (var i = 0; i < trs.length; i++) { - var cells = trs[i].cells; - for (var j = 0; j < cells.length; j++) { - var c = cells[j]; - - var rowIndex = c.parentNode.rowIndex; - var cellId = rowIndex + "-" + c.cellIndex; - var rowSpan = c.rowSpan || 1; - var colSpan = c.colSpan || 1 - var firstAvailCol; - if (typeof(matrix[rowIndex]) == "undefined") { - matrix[rowIndex] = []; - } - // Find first available column in the first row - for (var k = 0; k < matrix[rowIndex].length + 1; k++) { - if (typeof(matrix[rowIndex][k]) == "undefined") { - firstAvailCol = k; - break; - } - } - lookup[cellId] = firstAvailCol; - for (var k = rowIndex; k < rowIndex + rowSpan; k++) { - if (typeof(matrix[k]) == "undefined") { - matrix[k] = []; - } - var matrixrow = matrix[k]; - for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) { - matrixrow[l] = "x"; - } - } - } - } - return lookup; - } - - function checkCellColSpan(table, rows, row) { - var arr = [], - r = table.tHead.rows, - c = r[row].cells; - - for (var i = 0; i < c.length; i++) { - var cell = c[i]; - - if (cell.colSpan > 1) { - arr = arr.concat(checkCellColSpan(table, headerArr, row++)); - } else { - if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) { - arr.push(cell); - } - // headerArr[row] = (i+row); - } - } - return arr; - }; - - function checkHeaderMetadata(cell) { - if (($.metadata) && ($(cell).metadata().sorter === false)) { - return true; - }; - return false; - } - - function checkHeaderOptions(table, i) { - if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) { - return true; - }; - return false; - } - - function checkHeaderOptionsSortingLocked(table, i) { - if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder; - return false; - } - - function applyWidget(table) { - var c = table.config.widgets; - var l = c.length; - for (var i = 0; i < l; i++) { - - getWidgetById(c[i]).format(table); - } - - } - - function getWidgetById(name) { - var l = widgets.length; - for (var i = 0; i < l; i++) { - if (widgets[i].id.toLowerCase() == name.toLowerCase()) { - return widgets[i]; - } - } - }; - - function formatSortingOrder(v) { - if (typeof(v) != "Number") { - return (v.toLowerCase() == "desc") ? 1 : 0; - } else { - return (v == 1) ? 1 : 0; - } - } - - function isValueInArray(v, a) { - var l = a.length; - for (var i = 0; i < l; i++) { - if (a[i][0] == v) { - return true; - } - } - return false; - } - - function setHeadersCss(table, $headers, list, css) { - // remove all header information - $headers.removeClass(css[0]).removeClass(css[1]); - - var h = []; - $headers.each(function (offset) { - if (!this.sortDisabled) { - h[this.column] = $(this); - } - }); - - var l = list.length; - for (var i = 0; i < l; i++) { - h[list[i][0]].addClass(css[list[i][1]]); - } - } - - function fixColumnWidth(table, $headers) { - var c = table.config; - if (c.widthFixed) { - var colgroup = $(''); - $("tr:first td", table.tBodies[0]).each(function () { - colgroup.append($('').css('width', $(this).width())); - }); - $(table).prepend(colgroup); - }; - } - - function updateHeaderSortCount(table, sortList) { - var c = table.config, - l = sortList.length; - for (var i = 0; i < l; i++) { - var s = sortList[i], - o = c.headerList[s[0]]; - o.count = s[1]; - o.count++; - } - } - - /* sorting methods */ - - function multisort(table, sortList, cache) { - - if (table.config.debug) { - var sortTime = new Date(); - } - - var dynamicExp = "var sortWrapper = function(a,b) {", - l = sortList.length; - - // TODO: inline functions. - for (var i = 0; i < l; i++) { - - var c = sortList[i][0]; - var order = sortList[i][1]; - // var s = (getCachedSortType(table.config.parsers,c) == "text") ? - // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? - // "sortNumeric" : "sortNumericDesc"); - // var s = (table.config.parsers[c].type == "text") ? ((order == 0) - // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ? - // makeSortNumeric(c) : makeSortNumericDesc(c)); - var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c)); - var e = "e" + i; - - dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c - // + "]); "; - dynamicExp += "if(" + e + ") { return " + e + "; } "; - dynamicExp += "else { "; - - } - - // if value is the same keep orignal order - var orgOrderCol = cache.normalized[0].length - 1; - dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];"; - - for (var i = 0; i < l; i++) { - dynamicExp += "}; "; - } - - dynamicExp += "return 0; "; - dynamicExp += "}; "; - - if (table.config.debug) { - benchmark("Evaling expression:" + dynamicExp, new Date()); - } - - eval(dynamicExp); - - cache.normalized.sort(sortWrapper); - - if (table.config.debug) { - benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime); - } - - return cache; - }; - - function makeSortFunction(type, direction, index) { - var a = "a[" + index + "]", - b = "b[" + index + "]"; - if (type == 'text' && direction == 'asc') { - return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));"; - } else if (type == 'text' && direction == 'desc') { - return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));"; - } else if (type == 'numeric' && direction == 'asc') { - return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));"; - } else if (type == 'numeric' && direction == 'desc') { - return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));"; - } - }; - - function makeSortText(i) { - return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));"; - }; - - function makeSortTextDesc(i) { - return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));"; - }; - - function makeSortNumeric(i) { - return "a[" + i + "]-b[" + i + "];"; - }; - - function makeSortNumericDesc(i) { - return "b[" + i + "]-a[" + i + "];"; - }; - - function sortText(a, b) { - if (table.config.sortLocaleCompare) return a.localeCompare(b); - return ((a < b) ? -1 : ((a > b) ? 1 : 0)); - }; - - function sortTextDesc(a, b) { - if (table.config.sortLocaleCompare) return b.localeCompare(a); - return ((b < a) ? -1 : ((b > a) ? 1 : 0)); - }; - - function sortNumeric(a, b) { - return a - b; - }; - - function sortNumericDesc(a, b) { - return b - a; - }; - - function getCachedSortType(parsers, i) { - return parsers[i].type; - }; /* public methods */ - this.construct = function (settings) { - return this.each(function () { - // if no thead or tbody quit. - if (!this.tHead || !this.tBodies) return; - // declare - var $this, $document, $headers, cache, config, shiftDown = 0, - sortOrder; - // new blank config object - this.config = {}; - // merge and extend. - config = $.extend(this.config, $.tablesorter.defaults, settings); - // store common expression for speed - $this = $(this); - // save the settings where they read - $.data(this, "tablesorter", config); - // build headers - $headers = buildHeaders(this); - // try to auto detect column type, and store in tables config - this.config.parsers = buildParserCache(this, $headers); - // build the cache for the tbody cells - cache = buildCache(this); - // get the css class names, could be done else where. - var sortCSS = [config.cssDesc, config.cssAsc]; - // fixate columns if the users supplies the fixedWidth option - fixColumnWidth(this); - // apply event handling to headers - // this is to big, perhaps break it out? - $headers.click( - - function (e) { - var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0; - if (!this.sortDisabled && totalRows > 0) { - // Only call sortStart if sorting is - // enabled. - $this.trigger("sortStart"); - // store exp, for speed - var $cell = $(this); - // get current column index - var i = this.column; - // get current column sort order - this.order = this.count++ % 2; - // always sort on the locked order. - if(this.lockedOrder) this.order = this.lockedOrder; - - // user only whants to sort on one - // column - if (!e[config.sortMultiSortKey]) { - // flush the sort list - config.sortList = []; - if (config.sortForce != null) { - var a = config.sortForce; - for (var j = 0; j < a.length; j++) { - if (a[j][0] != i) { - config.sortList.push(a[j]); - } - } - } - // add column to sort list - config.sortList.push([i, this.order]); - // multi column sorting - } else { - // the user has clicked on an all - // ready sortet column. - if (isValueInArray(i, config.sortList)) { - // revers the sorting direction - // for all tables. - for (var j = 0; j < config.sortList.length; j++) { - var s = config.sortList[j], - o = config.headerList[s[0]]; - if (s[0] == i) { - o.count = s[1]; - o.count++; - s[1] = o.count % 2; - } - } - } else { - // add column to sort list array - config.sortList.push([i, this.order]); - } - }; - setTimeout(function () { - // set css for headers - setHeadersCss($this[0], $headers, config.sortList, sortCSS); - appendToTable( - $this[0], multisort( - $this[0], config.sortList, cache) - ); - }, 1); - // stop normal event by returning false - return false; - } - // cancel selection - }).mousedown(function () { - if (config.cancelSelection) { - this.onselectstart = function () { - return false - }; - return false; - } - }); - // apply easy methods that trigger binded events - $this.bind("update", function () { - var me = this; - setTimeout(function () { - // rebuild parsers. - me.config.parsers = buildParserCache( - me, $headers); - // rebuild the cache map - cache = buildCache(me); - }, 1); - }).bind("updateCell", function (e, cell) { - var config = this.config; - // get position from the dom. - var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex]; - // update cache - cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format( - getElementText(config, cell), cell); - }).bind("sorton", function (e, list) { - $(this).trigger("sortStart"); - config.sortList = list; - // update and store the sortlist - var sortList = config.sortList; - // update header count index - updateHeaderSortCount(this, sortList); - // set css for headers - setHeadersCss(this, $headers, sortList, sortCSS); - // sort the table and append it to the dom - appendToTable(this, multisort(this, sortList, cache)); - }).bind("appendCache", function () { - appendToTable(this, cache); - }).bind("applyWidgetId", function (e, id) { - getWidgetById(id).format(this); - }).bind("applyWidgets", function () { - // apply widgets - applyWidget(this); - }); - if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) { - config.sortList = $(this).metadata().sortlist; - } - // if user has supplied a sort list to constructor. - if (config.sortList.length > 0) { - $this.trigger("sorton", [config.sortList]); - } - // apply widgets - applyWidget(this); - }); - }; - this.addParser = function (parser) { - var l = parsers.length, - a = true; - for (var i = 0; i < l; i++) { - if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) { - a = false; - } - } - if (a) { - parsers.push(parser); - }; - }; - this.addWidget = function (widget) { - widgets.push(widget); - }; - this.formatFloat = function (s) { - var i = parseFloat(s); - return (isNaN(i)) ? 0 : i; - }; - this.formatInt = function (s) { - var i = parseInt(s); - return (isNaN(i)) ? 0 : i; - }; - this.isDigit = function (s, config) { - // replace all an wanted chars and match. - return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, ''))); - }; - this.clearTableBody = function (table) { - if ($.browser.msie) { - function empty() { - while (this.firstChild) - this.removeChild(this.firstChild); - } - empty.apply(table.tBodies[0]); - } else { - table.tBodies[0].innerHTML = ""; - } - }; - } - }); - - // extend plugin scope - $.fn.extend({ - tablesorter: $.tablesorter.construct - }); - - // make shortcut - var ts = $.tablesorter; - - // add default parsers - ts.addParser({ - id: "text", - is: function (s) { - return true; - }, format: function (s) { - return $.trim(s.toLocaleLowerCase()); - }, type: "text" - }); - - ts.addParser({ - id: "digit", - is: function (s, table) { - var c = table.config; - return $.tablesorter.isDigit(s, c); - }, format: function (s) { - return $.tablesorter.formatFloat(s); - }, type: "numeric" - }); - - ts.addParser({ - id: "currency", - is: function (s) { - return /^[£$€?.]/.test(s); - }, format: function (s) { - return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), "")); - }, type: "numeric" - }); - - ts.addParser({ - id: "ipAddress", - is: function (s) { - return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s); - }, format: function (s) { - var a = s.split("."), - r = "", - l = a.length; - for (var i = 0; i < l; i++) { - var item = a[i]; - if (item.length == 2) { - r += "0" + item; - } else { - r += item; - } - } - return $.tablesorter.formatFloat(r); - }, type: "numeric" - }); - - ts.addParser({ - id: "url", - is: function (s) { - return /^(https?|ftp|file):\/\/$/.test(s); - }, format: function (s) { - return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), '')); - }, type: "text" - }); - - ts.addParser({ - id: "isoDate", - is: function (s) { - return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s); - }, format: function (s) { - return $.tablesorter.formatFloat((s != "") ? new Date(s.replace( - new RegExp(/-/g), "/")).getTime() : "0"); - }, type: "numeric" - }); - - ts.addParser({ - id: "percent", - is: function (s) { - return /\%$/.test($.trim(s)); - }, format: function (s) { - return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), "")); - }, type: "numeric" - }); - - ts.addParser({ - id: "usLongDate", - is: function (s) { - return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)); - }, format: function (s) { - return $.tablesorter.formatFloat(new Date(s).getTime()); - }, type: "numeric" - }); - - ts.addParser({ - id: "shortDate", - is: function (s) { - return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s); - }, format: function (s, table) { - var c = table.config; - s = s.replace(/\-/g, "/"); - if (c.dateFormat == "us") { - // reformat the string in ISO format - s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2"); - } else if (c.dateFormat == "uk") { - // reformat the string in ISO format - s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1"); - } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") { - s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3"); - } - return $.tablesorter.formatFloat(new Date(s).getTime()); - }, type: "numeric" - }); - ts.addParser({ - id: "time", - is: function (s) { - return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s); - }, format: function (s) { - return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime()); - }, type: "numeric" - }); - ts.addParser({ - id: "metadata", - is: function (s) { - return false; - }, format: function (s, table, cell) { - var c = table.config, - p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName; - return $(cell).metadata()[p]; - }, type: "numeric" - }); - // add default widgets - ts.addWidget({ - id: "zebra", - format: function (table) { - if (table.config.debug) { - var time = new Date(); - } - var $tr, row = -1, - odd; - // loop through the visible rows - $("tr:visible", table.tBodies[0]).each(function (i) { - $tr = $(this); - // style children rows the same way the parent - // row was styled - if (!$tr.hasClass(table.config.cssChildRow)) row++; - odd = (row % 2 == 0); - $tr.removeClass( - table.config.widgetZebra.css[odd ? 0 : 1]).addClass( - table.config.widgetZebra.css[odd ? 1 : 0]) - }); - if (table.config.debug) { - $.tablesorter.benchmark("Applying Zebra widget", time); - } - } - }); +/* + * + * TableSorter 2.0 - Client-side table sorting with ease! + * Version 2.0.5b + * @requires jQuery v1.2.3 + * + * Copyright (c) 2007 Christian Bach + * Examples and docs at: http://tablesorter.com + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + */ +/** + * + * @description Create a sortable table with multi-column sorting capabilitys + * + * @example $('table').tablesorter(); + * @desc Create a simple tablesorter interface. + * + * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] }); + * @desc Create a tablesorter interface and sort on the first and secound column column headers. + * + * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } }); + * + * @desc Create a tablesorter interface and disableing the first and second column headers. + * + * + * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } }); + * + * @desc Create a tablesorter interface and set a column parser for the first + * and second column. + * + * + * @param Object + * settings An object literal containing key/value pairs to provide + * optional settings. + * + * + * @option String cssHeader (optional) A string of the class name to be appended + * to sortable tr elements in the thead of the table. Default value: + * "header" + * + * @option String cssAsc (optional) A string of the class name to be appended to + * sortable tr elements in the thead on a ascending sort. Default value: + * "headerSortUp" + * + * @option String cssDesc (optional) A string of the class name to be appended + * to sortable tr elements in the thead on a descending sort. Default + * value: "headerSortDown" + * + * @option String sortInitialOrder (optional) A string of the inital sorting + * order can be asc or desc. Default value: "asc" + * + * @option String sortMultisortKey (optional) A string of the multi-column sort + * key. Default value: "shiftKey" + * + * @option String textExtraction (optional) A string of the text-extraction + * method to use. For complex html structures inside td cell set this + * option to "complex", on large tables the complex option can be slow. + * Default value: "simple" + * + * @option Object headers (optional) An array containing the forces sorting + * rules. This option let's you specify a default sorting rule. Default + * value: null + * + * @option Array sortList (optional) An array containing the forces sorting + * rules. This option let's you specify a default sorting rule. Default + * value: null + * + * @option Array sortForce (optional) An array containing forced sorting rules. + * This option let's you specify a default sorting rule, which is + * prepended to user-selected rules. Default value: null + * + * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever + * to use String.localeCampare method or not. Default set to true. + * + * + * @option Array sortAppend (optional) An array containing forced sorting rules. + * This option let's you specify a default sorting rule, which is + * appended to user-selected rules. Default value: null + * + * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter + * should apply fixed widths to the table columns. This is usefull when + * using the pager companion plugin. This options requires the dimension + * jquery plugin. Default value: false + * + * @option Boolean cancelSelection (optional) Boolean flag indicating if + * tablesorter should cancel selection of the table headers text. + * Default value: true + * + * @option Boolean debug (optional) Boolean flag indicating if tablesorter + * should display debuging information usefull for development. + * + * @type jQuery + * + * @name tablesorter + * + * @cat Plugins/Tablesorter + * + * @author Christian Bach/christian.bach@polyester.se + */ + +(function ($) { + $.extend({ + tablesorter: new + function () { + + var parsers = [], + widgets = []; + + this.defaults = { + cssHeader: "header", + cssAsc: "headerSortUp", + cssDesc: "headerSortDown", + cssChildRow: "expand-child", + sortInitialOrder: "asc", + sortMultiSortKey: "shiftKey", + sortForce: null, + sortAppend: null, + sortLocaleCompare: true, + textExtraction: "simple", + parsers: {}, widgets: [], + widgetZebra: { + css: ["even", "odd"] + }, headers: {}, widthFixed: false, + cancelSelection: true, + sortList: [], + headerList: [], + dateFormat: "us", + decimal: '/\.|\,/g', + onRenderHeader: null, + selectorHeaders: 'thead th', + debug: false + }; + + /* debuging utils */ + + function benchmark(s, d) { + log(s + "," + (new Date().getTime() - d.getTime()) + "ms"); + } + + this.benchmark = benchmark; + + function log(s) { + if (typeof console != "undefined" && typeof console.debug != "undefined") { + console.log(s); + } else { + alert(s); + } + } + + /* parsers utils */ + + function buildParserCache(table, $headers) { + + if (table.config.debug) { + var parsersDebug = ""; + } + + if (table.tBodies.length == 0) return; // In the case of empty tables + var rows = table.tBodies[0].rows; + + if (rows[0]) { + + var list = [], + cells = rows[0].cells, + l = cells.length; + + for (var i = 0; i < l; i++) { + + var p = false; + + if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) { + + p = getParserById($($headers[i]).metadata().sorter); + + } else if ((table.config.headers[i] && table.config.headers[i].sorter)) { + + p = getParserById(table.config.headers[i].sorter); + } + if (!p) { + + p = detectParserForColumn(table, rows, -1, i); + } + + if (table.config.debug) { + parsersDebug += "column:" + i + " parser:" + p.id + "\n"; + } + + list.push(p); + } + } + + if (table.config.debug) { + log(parsersDebug); + } + + return list; + }; + + function detectParserForColumn(table, rows, rowIndex, cellIndex) { + var l = parsers.length, + node = false, + nodeValue = false, + keepLooking = true; + while (nodeValue == '' && keepLooking) { + rowIndex++; + if (rows[rowIndex]) { + node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex); + nodeValue = trimAndGetNodeText(table.config, node); + if (table.config.debug) { + log('Checking if value was empty on row:' + rowIndex); + } + } else { + keepLooking = false; + } + } + for (var i = 1; i < l; i++) { + if (parsers[i].is(nodeValue, table, node)) { + return parsers[i]; + } + } + // 0 is always the generic parser (text) + return parsers[0]; + } + + function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) { + return rows[rowIndex].cells[cellIndex]; + } + + function trimAndGetNodeText(config, node) { + return $.trim(getElementText(config, node)); + } + + function getParserById(name) { + var l = parsers.length; + for (var i = 0; i < l; i++) { + if (parsers[i].id.toLowerCase() == name.toLowerCase()) { + return parsers[i]; + } + } + return false; + } + + /* utils */ + + function buildCache(table) { + + if (table.config.debug) { + var cacheTime = new Date(); + } + + var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0, + totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0, + parsers = table.config.parsers, + cache = { + row: [], + normalized: [] + }; + + for (var i = 0; i < totalRows; ++i) { + + /** Add the table data to main data array */ + var c = $(table.tBodies[0].rows[i]), + cols = []; + + // if this is a child row, add it to the last row's children and + // continue to the next row + if (c.hasClass(table.config.cssChildRow)) { + cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c); + // go to the next for loop + continue; + } + + cache.row.push(c); + + for (var j = 0; j < totalCells; ++j) { + cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j])); + } + + cols.push(cache.normalized.length); // add position for rowCache + cache.normalized.push(cols); + cols = null; + }; + + if (table.config.debug) { + benchmark("Building cache for " + totalRows + " rows:", cacheTime); + } + + return cache; + }; + + function getElementText(config, node) { + + var text = ""; + + if (!node) return ""; + + if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false; + + if (config.textExtraction == "simple") { + if (config.supportsTextContent) { + text = node.textContent; + } else { + if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) { + text = node.childNodes[0].innerHTML; + } else { + text = node.innerHTML; + } + } + } else { + if (typeof(config.textExtraction) == "function") { + text = config.textExtraction(node); + } else { + text = $(node).text(); + } + } + return text; + } + + function appendToTable(table, cache) { + + if (table.config.debug) { + var appendTime = new Date() + } + + var c = cache, + r = c.row, + n = c.normalized, + totalRows = n.length, + checkCell = (n[0].length - 1), + tableBody = $(table.tBodies[0]), + rows = []; + + + for (var i = 0; i < totalRows; i++) { + var pos = n[i][checkCell]; + + rows.push(r[pos]); + + if (!table.config.appender) { + + //var o = ; + var l = r[pos].length; + for (var j = 0; j < l; j++) { + tableBody[0].appendChild(r[pos][j]); + } + + // + } + } + + + + if (table.config.appender) { + + table.config.appender(table, rows); + } + + rows = null; + + if (table.config.debug) { + benchmark("Rebuilt table:", appendTime); + } + + // apply table widgets + applyWidget(table); + + // trigger sortend + setTimeout(function () { + $(table).trigger("sortEnd"); + }, 0); + + }; + + function buildHeaders(table) { + + if (table.config.debug) { + var time = new Date(); + } + + var meta = ($.metadata) ? true : false; + + var header_index = computeTableHeaderCellIndexes(table); + + $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) { + + this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex]; + // this.column = index; + this.order = formatSortingOrder(table.config.sortInitialOrder); + + + this.count = this.order; + + if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true; + if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index); + + if (!this.sortDisabled) { + var $th = $(this).addClass(table.config.cssHeader); + if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th); + } + + // add cell to headerList + table.config.headerList[index] = this; + }); + + if (table.config.debug) { + benchmark("Built headers:", time); + log($tableHeaders); + } + + return $tableHeaders; + + }; + + // from: + // http://www.javascripttoolbox.com/lib/table/examples.php + // http://www.javascripttoolbox.com/temp/table_cellindex.html + + + function computeTableHeaderCellIndexes(t) { + var matrix = []; + var lookup = {}; + var thead = t.getElementsByTagName('THEAD')[0]; + var trs = thead.getElementsByTagName('TR'); + + for (var i = 0; i < trs.length; i++) { + var cells = trs[i].cells; + for (var j = 0; j < cells.length; j++) { + var c = cells[j]; + + var rowIndex = c.parentNode.rowIndex; + var cellId = rowIndex + "-" + c.cellIndex; + var rowSpan = c.rowSpan || 1; + var colSpan = c.colSpan || 1 + var firstAvailCol; + if (typeof(matrix[rowIndex]) == "undefined") { + matrix[rowIndex] = []; + } + // Find first available column in the first row + for (var k = 0; k < matrix[rowIndex].length + 1; k++) { + if (typeof(matrix[rowIndex][k]) == "undefined") { + firstAvailCol = k; + break; + } + } + lookup[cellId] = firstAvailCol; + for (var k = rowIndex; k < rowIndex + rowSpan; k++) { + if (typeof(matrix[k]) == "undefined") { + matrix[k] = []; + } + var matrixrow = matrix[k]; + for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) { + matrixrow[l] = "x"; + } + } + } + } + return lookup; + } + + function checkCellColSpan(table, rows, row) { + var arr = [], + r = table.tHead.rows, + c = r[row].cells; + + for (var i = 0; i < c.length; i++) { + var cell = c[i]; + + if (cell.colSpan > 1) { + arr = arr.concat(checkCellColSpan(table, headerArr, row++)); + } else { + if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) { + arr.push(cell); + } + // headerArr[row] = (i+row); + } + } + return arr; + }; + + function checkHeaderMetadata(cell) { + if (($.metadata) && ($(cell).metadata().sorter === false)) { + return true; + }; + return false; + } + + function checkHeaderOptions(table, i) { + if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) { + return true; + }; + return false; + } + + function checkHeaderOptionsSortingLocked(table, i) { + if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder; + return false; + } + + function applyWidget(table) { + var c = table.config.widgets; + var l = c.length; + for (var i = 0; i < l; i++) { + + getWidgetById(c[i]).format(table); + } + + } + + function getWidgetById(name) { + var l = widgets.length; + for (var i = 0; i < l; i++) { + if (widgets[i].id.toLowerCase() == name.toLowerCase()) { + return widgets[i]; + } + } + }; + + function formatSortingOrder(v) { + if (typeof(v) != "Number") { + return (v.toLowerCase() == "desc") ? 1 : 0; + } else { + return (v == 1) ? 1 : 0; + } + } + + function isValueInArray(v, a) { + var l = a.length; + for (var i = 0; i < l; i++) { + if (a[i][0] == v) { + return true; + } + } + return false; + } + + function setHeadersCss(table, $headers, list, css) { + // remove all header information + $headers.removeClass(css[0]).removeClass(css[1]); + + var h = []; + $headers.each(function (offset) { + if (!this.sortDisabled) { + h[this.column] = $(this); + } + }); + + var l = list.length; + for (var i = 0; i < l; i++) { + h[list[i][0]].addClass(css[list[i][1]]); + } + } + + function fixColumnWidth(table, $headers) { + var c = table.config; + if (c.widthFixed) { + var colgroup = $(''); + $("tr:first td", table.tBodies[0]).each(function () { + colgroup.append($('').css('width', $(this).width())); + }); + $(table).prepend(colgroup); + }; + } + + function updateHeaderSortCount(table, sortList) { + var c = table.config, + l = sortList.length; + for (var i = 0; i < l; i++) { + var s = sortList[i], + o = c.headerList[s[0]]; + o.count = s[1]; + o.count++; + } + } + + /* sorting methods */ + + function multisort(table, sortList, cache) { + + if (table.config.debug) { + var sortTime = new Date(); + } + + var dynamicExp = "var sortWrapper = function(a,b) {", + l = sortList.length; + + // TODO: inline functions. + for (var i = 0; i < l; i++) { + + var c = sortList[i][0]; + var order = sortList[i][1]; + // var s = (getCachedSortType(table.config.parsers,c) == "text") ? + // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? + // "sortNumeric" : "sortNumericDesc"); + // var s = (table.config.parsers[c].type == "text") ? ((order == 0) + // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ? + // makeSortNumeric(c) : makeSortNumericDesc(c)); + var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c)); + var e = "e" + i; + + dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c + // + "]); "; + dynamicExp += "if(" + e + ") { return " + e + "; } "; + dynamicExp += "else { "; + + } + + // if value is the same keep orignal order + var orgOrderCol = cache.normalized[0].length - 1; + dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];"; + + for (var i = 0; i < l; i++) { + dynamicExp += "}; "; + } + + dynamicExp += "return 0; "; + dynamicExp += "}; "; + + if (table.config.debug) { + benchmark("Evaling expression:" + dynamicExp, new Date()); + } + + eval(dynamicExp); + + cache.normalized.sort(sortWrapper); + + if (table.config.debug) { + benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime); + } + + return cache; + }; + + function makeSortFunction(type, direction, index) { + var a = "a[" + index + "]", + b = "b[" + index + "]"; + if (type == 'text' && direction == 'asc') { + return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));"; + } else if (type == 'text' && direction == 'desc') { + return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));"; + } else if (type == 'numeric' && direction == 'asc') { + return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));"; + } else if (type == 'numeric' && direction == 'desc') { + return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));"; + } + }; + + function makeSortText(i) { + return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));"; + }; + + function makeSortTextDesc(i) { + return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));"; + }; + + function makeSortNumeric(i) { + return "a[" + i + "]-b[" + i + "];"; + }; + + function makeSortNumericDesc(i) { + return "b[" + i + "]-a[" + i + "];"; + }; + + function sortText(a, b) { + if (table.config.sortLocaleCompare) return a.localeCompare(b); + return ((a < b) ? -1 : ((a > b) ? 1 : 0)); + }; + + function sortTextDesc(a, b) { + if (table.config.sortLocaleCompare) return b.localeCompare(a); + return ((b < a) ? -1 : ((b > a) ? 1 : 0)); + }; + + function sortNumeric(a, b) { + return a - b; + }; + + function sortNumericDesc(a, b) { + return b - a; + }; + + function getCachedSortType(parsers, i) { + return parsers[i].type; + }; /* public methods */ + this.construct = function (settings) { + return this.each(function () { + // if no thead or tbody quit. + if (!this.tHead || !this.tBodies) return; + // declare + var $this, $document, $headers, cache, config, shiftDown = 0, + sortOrder; + // new blank config object + this.config = {}; + // merge and extend. + config = $.extend(this.config, $.tablesorter.defaults, settings); + // store common expression for speed + $this = $(this); + // save the settings where they read + $.data(this, "tablesorter", config); + // build headers + $headers = buildHeaders(this); + // try to auto detect column type, and store in tables config + this.config.parsers = buildParserCache(this, $headers); + // build the cache for the tbody cells + cache = buildCache(this); + // get the css class names, could be done else where. + var sortCSS = [config.cssDesc, config.cssAsc]; + // fixate columns if the users supplies the fixedWidth option + fixColumnWidth(this); + // apply event handling to headers + // this is to big, perhaps break it out? + $headers.click( + + function (e) { + var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0; + if (!this.sortDisabled && totalRows > 0) { + // Only call sortStart if sorting is + // enabled. + $this.trigger("sortStart"); + // store exp, for speed + var $cell = $(this); + // get current column index + var i = this.column; + // get current column sort order + this.order = this.count++ % 2; + // always sort on the locked order. + if(this.lockedOrder) this.order = this.lockedOrder; + + // user only whants to sort on one + // column + if (!e[config.sortMultiSortKey]) { + // flush the sort list + config.sortList = []; + if (config.sortForce != null) { + var a = config.sortForce; + for (var j = 0; j < a.length; j++) { + if (a[j][0] != i) { + config.sortList.push(a[j]); + } + } + } + // add column to sort list + config.sortList.push([i, this.order]); + // multi column sorting + } else { + // the user has clicked on an all + // ready sortet column. + if (isValueInArray(i, config.sortList)) { + // revers the sorting direction + // for all tables. + for (var j = 0; j < config.sortList.length; j++) { + var s = config.sortList[j], + o = config.headerList[s[0]]; + if (s[0] == i) { + o.count = s[1]; + o.count++; + s[1] = o.count % 2; + } + } + } else { + // add column to sort list array + config.sortList.push([i, this.order]); + } + }; + setTimeout(function () { + // set css for headers + setHeadersCss($this[0], $headers, config.sortList, sortCSS); + appendToTable( + $this[0], multisort( + $this[0], config.sortList, cache) + ); + }, 1); + // stop normal event by returning false + return false; + } + // cancel selection + }).mousedown(function () { + if (config.cancelSelection) { + this.onselectstart = function () { + return false + }; + return false; + } + }); + // apply easy methods that trigger binded events + $this.bind("update", function () { + var me = this; + setTimeout(function () { + // rebuild parsers. + me.config.parsers = buildParserCache( + me, $headers); + // rebuild the cache map + cache = buildCache(me); + }, 1); + }).bind("updateCell", function (e, cell) { + var config = this.config; + // get position from the dom. + var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex]; + // update cache + cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format( + getElementText(config, cell), cell); + }).bind("sorton", function (e, list) { + $(this).trigger("sortStart"); + config.sortList = list; + // update and store the sortlist + var sortList = config.sortList; + // update header count index + updateHeaderSortCount(this, sortList); + // set css for headers + setHeadersCss(this, $headers, sortList, sortCSS); + // sort the table and append it to the dom + appendToTable(this, multisort(this, sortList, cache)); + }).bind("appendCache", function () { + appendToTable(this, cache); + }).bind("applyWidgetId", function (e, id) { + getWidgetById(id).format(this); + }).bind("applyWidgets", function () { + // apply widgets + applyWidget(this); + }); + if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) { + config.sortList = $(this).metadata().sortlist; + } + // if user has supplied a sort list to constructor. + if (config.sortList.length > 0) { + $this.trigger("sorton", [config.sortList]); + } + // apply widgets + applyWidget(this); + }); + }; + this.addParser = function (parser) { + var l = parsers.length, + a = true; + for (var i = 0; i < l; i++) { + if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) { + a = false; + } + } + if (a) { + parsers.push(parser); + }; + }; + this.addWidget = function (widget) { + widgets.push(widget); + }; + this.formatFloat = function (s) { + var i = parseFloat(s); + return (isNaN(i)) ? 0 : i; + }; + this.formatInt = function (s) { + var i = parseInt(s); + return (isNaN(i)) ? 0 : i; + }; + this.isDigit = function (s, config) { + // replace all an wanted chars and match. + return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, ''))); + }; + this.clearTableBody = function (table) { + if ($.browser.msie) { + function empty() { + while (this.firstChild) + this.removeChild(this.firstChild); + } + empty.apply(table.tBodies[0]); + } else { + table.tBodies[0].innerHTML = ""; + } + }; + } + }); + + // extend plugin scope + $.fn.extend({ + tablesorter: $.tablesorter.construct + }); + + // make shortcut + var ts = $.tablesorter; + + // add default parsers + ts.addParser({ + id: "text", + is: function (s) { + return true; + }, format: function (s) { + return $.trim(s.toLocaleLowerCase()); + }, type: "text" + }); + + ts.addParser({ + id: "digit", + is: function (s, table) { + var c = table.config; + return $.tablesorter.isDigit(s, c); + }, format: function (s) { + return $.tablesorter.formatFloat(s); + }, type: "numeric" + }); + + ts.addParser({ + id: "currency", + is: function (s) { + return /^[£$€?.]/.test(s); + }, format: function (s) { + return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), "")); + }, type: "numeric" + }); + + ts.addParser({ + id: "ipAddress", + is: function (s) { + return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s); + }, format: function (s) { + var a = s.split("."), + r = "", + l = a.length; + for (var i = 0; i < l; i++) { + var item = a[i]; + if (item.length == 2) { + r += "0" + item; + } else { + r += item; + } + } + return $.tablesorter.formatFloat(r); + }, type: "numeric" + }); + + ts.addParser({ + id: "url", + is: function (s) { + return /^(https?|ftp|file):\/\/$/.test(s); + }, format: function (s) { + return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), '')); + }, type: "text" + }); + + ts.addParser({ + id: "isoDate", + is: function (s) { + return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s); + }, format: function (s) { + return $.tablesorter.formatFloat((s != "") ? new Date(s.replace( + new RegExp(/-/g), "/")).getTime() : "0"); + }, type: "numeric" + }); + + ts.addParser({ + id: "percent", + is: function (s) { + return /\%$/.test($.trim(s)); + }, format: function (s) { + return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), "")); + }, type: "numeric" + }); + + ts.addParser({ + id: "usLongDate", + is: function (s) { + return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)); + }, format: function (s) { + return $.tablesorter.formatFloat(new Date(s).getTime()); + }, type: "numeric" + }); + + ts.addParser({ + id: "shortDate", + is: function (s) { + return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s); + }, format: function (s, table) { + var c = table.config; + s = s.replace(/\-/g, "/"); + if (c.dateFormat == "us") { + // reformat the string in ISO format + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2"); + } else if (c.dateFormat == "uk") { + // reformat the string in ISO format + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1"); + } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") { + s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3"); + } + return $.tablesorter.formatFloat(new Date(s).getTime()); + }, type: "numeric" + }); + ts.addParser({ + id: "time", + is: function (s) { + return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s); + }, format: function (s) { + return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime()); + }, type: "numeric" + }); + ts.addParser({ + id: "metadata", + is: function (s) { + return false; + }, format: function (s, table, cell) { + var c = table.config, + p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName; + return $(cell).metadata()[p]; + }, type: "numeric" + }); + // add default widgets + ts.addWidget({ + id: "zebra", + format: function (table) { + if (table.config.debug) { + var time = new Date(); + } + var $tr, row = -1, + odd; + // loop through the visible rows + $("tr:visible", table.tBodies[0]).each(function (i) { + $tr = $(this); + // style children rows the same way the parent + // row was styled + if (!$tr.hasClass(table.config.cssChildRow)) row++; + odd = (row % 2 == 0); + $tr.removeClass( + table.config.widgetZebra.css[odd ? 0 : 1]).addClass( + table.config.widgetZebra.css[odd ? 1 : 0]) + }); + if (table.config.debug) { + $.tablesorter.benchmark("Applying Zebra widget", time); + } + } + }); })(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/jquery.timeago.js b/app/assets/javascripts/jquery.timeago.js index 4d58026..893b382 100644 --- a/app/assets/javascripts/jquery.timeago.js +++ b/app/assets/javascripts/jquery.timeago.js @@ -1,193 +1,193 @@ -/** - * Timeago is a jQuery plugin that makes it easy to support automatically - * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). - * - * @name timeago - * @version 1.3.0 - * @requires jQuery v1.2.3+ - * @author Ryan McGeary - * @license MIT License - http://www.opensource.org/licenses/mit-license.php - * - * For usage and examples, visit: - * http://timeago.yarp.com/ - * - * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) - */ - -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['jquery'], factory); - } else { - // Browser globals - factory(jQuery); - } -}(function ($) { - $.timeago = function(timestamp) { - if (timestamp instanceof Date) { - return inWords(timestamp); - } else if (typeof timestamp === "string") { - return inWords($.timeago.parse(timestamp)); - } else if (typeof timestamp === "number") { - return inWords(new Date(timestamp)); - } else { - return inWords($.timeago.datetime(timestamp)); - } - }; - var $t = $.timeago; - - $.extend($.timeago, { - settings: { - refreshMillis: 60000, - allowFuture: false, - localeTitle: false, - cutoff: 0, - strings: { - prefixAgo: null, - prefixFromNow: null, - suffixAgo: "ago", - suffixFromNow: "from now", - seconds: "less than a minute", - minute: "about a minute", - minutes: "%d minutes", - hour: "about an hour", - hours: "about %d hours", - day: "a day", - days: "%d days", - month: "about a month", - months: "%d months", - year: "about a year", - years: "%d years", - wordSeparator: " ", - numbers: [] - } - }, - inWords: function(distanceMillis) { - var $l = this.settings.strings; - var prefix = $l.prefixAgo; - var suffix = $l.suffixAgo; - if (this.settings.allowFuture) { - if (distanceMillis < 0) { - prefix = $l.prefixFromNow; - suffix = $l.suffixFromNow; - } - } - - var seconds = Math.abs(distanceMillis) / 1000; - var minutes = seconds / 60; - var hours = minutes / 60; - var days = hours / 24; - var years = days / 365; - - function substitute(stringOrFunction, number) { - var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; - var value = ($l.numbers && $l.numbers[number]) || number; - return string.replace(/%d/i, value); - } - - var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || - seconds < 90 && substitute($l.minute, 1) || - minutes < 45 && substitute($l.minutes, Math.round(minutes)) || - minutes < 90 && substitute($l.hour, 1) || - hours < 24 && substitute($l.hours, Math.round(hours)) || - hours < 42 && substitute($l.day, 1) || - days < 30 && substitute($l.days, Math.round(days)) || - days < 45 && substitute($l.month, 1) || - days < 365 && substitute($l.months, Math.round(days / 30)) || - years < 1.5 && substitute($l.year, 1) || - substitute($l.years, Math.round(years)); - - var separator = $l.wordSeparator || ""; - if ($l.wordSeparator === undefined) { separator = " "; } - return $.trim([prefix, words, suffix].join(separator)); - }, - parse: function(iso8601) { - var s = $.trim(iso8601); - s = s.replace(/\.\d+/,""); // remove milliseconds - s = s.replace(/-/,"/").replace(/-/,"/"); - s = s.replace(/T/," ").replace(/Z/," UTC"); - s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 - return new Date(s); - }, - datetime: function(elem) { - var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); - return $t.parse(iso8601); - }, - isTime: function(elem) { - // jQuery's `is()` doesn't play well with HTML5 in IE - return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); - } - }); - - // functions that can be called via $(el).timeago('action') - // init is default when no action is given - // functions are called with context of a single element - var functions = { - init: function(){ - var refresh_el = $.proxy(refresh, this); - refresh_el(); - var $s = $t.settings; - if ($s.refreshMillis > 0) { - setInterval(refresh_el, $s.refreshMillis); - } - }, - update: function(time){ - $(this).data('timeago', { datetime: $t.parse(time) }); - refresh.apply(this); - }, - updateFromDOM: function(){ - $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); - refresh.apply(this); - } - }; - - $.fn.timeago = function(action, options) { - var fn = action ? functions[action] : functions.init; - if(!fn){ - throw new Error("Unknown function name '"+ action +"' for timeago"); - } - // each over objects here and call the requested function - this.each(function(){ - fn.call(this, options); - }); - return this; - }; - - function refresh() { - var data = prepareData(this); - var $s = $t.settings; - - if (!isNaN(data.datetime)) { - if ( $s.cutoff == 0 || distance(data.datetime) < $s.cutoff) { - $(this).text(inWords(data.datetime)); - } - } - return this; - } - - function prepareData(element) { - element = $(element); - if (!element.data("timeago")) { - element.data("timeago", { datetime: $t.datetime(element) }); - var text = $.trim(element.text()); - if ($t.settings.localeTitle) { - element.attr("title", element.data('timeago').datetime.toLocaleString()); - } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { - element.attr("title", text); - } - } - return element.data("timeago"); - } - - function inWords(date) { - return $t.inWords(distance(date)); - } - - function distance(date) { - return (new Date().getTime() - date.getTime()); - } - - // fix for IE6 suckage - document.createElement("abbr"); - document.createElement("time"); -})); +/** + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 1.3.0 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowFuture: false, + localeTitle: false, + cutoff: 0, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + inWords: function(distanceMillis) { + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function(){ + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + setInterval(refresh_el, $s.refreshMillis); + } + }, + update: function(time){ + $(this).data('timeago', { datetime: $t.parse(time) }); + refresh.apply(this); + }, + updateFromDOM: function(){ + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if(!fn){ + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function(){ + fn.call(this, options); + }); + return this; + }; + + function refresh() { + var data = prepareData(this); + var $s = $t.settings; + + if (!isNaN(data.datetime)) { + if ( $s.cutoff == 0 || distance(data.datetime) < $s.cutoff) { + $(this).text(inWords(data.datetime)); + } + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +})); diff --git a/app/assets/javascripts/plans.js b/app/assets/javascripts/plans.js index 43db140..0cda411 100644 --- a/app/assets/javascripts/plans.js +++ b/app/assets/javascripts/plans.js @@ -1,536 +1,536 @@ -//= require jquery.timeago.js -//= require tinymce - -var dirty = {}; - - - -$( document ).ready(function() { - - //reload page back to where it was before committing comment - - if($('#comment_section_id').length) { - var section_id = $('#comment_section_id').val(); - - $("#collapse-" + section_id).addClass("in"); - $("#collapse-" + section_id).children(".accordion-inner").find(".loading").show(); - $("#collapse-" + section_id).children(".accordion-inner").find(".loaded").hide(); - - setTimeout(function(){ - $("loaded").find(".section-lock-notice").html(""); - $("loaded").find(".section-lock-notice").hide(); - $(".question-form").find("select").removeAttr('disabled'); - $(".question-div").find(".question-readonly").hide(); - $(".question-div").find(".question-form").show(); - - $("#collapse-" + section_id).children(".accordion-inner").find(".loading").hide(); - $("#collapse-" + section_id).children(".accordion-inner").find(".loaded").show(); - $('html, body').animate({ - 'scrollTop': $("#current_question").offset().top - },1000); - },8000); - } - - window.onbeforeunload = function(){ - var message = null; - if ($.fn.is_dirty()) { - var questions = $.fn.get_unsaved_questions(); - message = I18n.t("you_have_unsaved_in_sections"); - $.each(questions, function(section_text, question_texts){ - message += "\n\u2022"+section_text; - }); - return message; - } - }; - - // Make timestamps readable - $('abbr.timeago').timeago(); - - // Update status messages on form submission - $("form.answer").submit(function(){ - var submit_button = $(this).find('input[type="submit"]'); - var saving_message = $(this).find('.saving-message'); - submit_button.parent().hide(); - q_id = $(this).find(".question_id").val(); - saving_message.show(); - s_status = $(this).closest(".accordion-group").find(".section-status:first"); - s_status.toggle_dirty(q_id, false); - // Allow quarter of a second for database to update - timeout = setTimeout(function(){ - $.getJSON("status.json", function(data) { - $.fn.update_plan_progress(data); - $.fn.update_timestamp(q_id, data); - s_status.update_section_progress(data); - submit_button.parent().show(); - saving_message.hide(); - }); - },250); - }); - - //accordion guidance - $('.accordion-guidance-link').on('click', function (e) { - e.stopPropagation(); - var show = true; - var div_to_toggle = $($(this).attr("href")); - if (div_to_toggle.hasClass('in')) { - show = false; - } - $($(this).attr("href")).toggleClass("in"); - if (show) { - $(this).children(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); - } - else { - $(this).children(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); - } - delete show; - delete div_to_toggle; - e.preventDefault(); - }); - - // Periodically check locks on open section - every 50 seconds - setInterval(function(){ - // Only lock/unlock if there are forms on the page (not read-only) - if ($('.question-form').length > 0) { - section = $('.section-collapse.in'); - if (section.length > 0) { - section.check_section_lock(); - } - } - }, 50000); - - // Handle section actions on accordion expansion/collapse - $('.section-collapse').on('show', function() { - var section = $(this); - section.find(".loaded").hide(); - section.find(".loading").show(); - // Only lock if there are forms on the page (not read-only) - if ($('.question-form').length > 0) { - section.check_section_lock(); - } - // check for updated answers - $.getJSON("status.json", function(data) { - $.fn.update_plan_progress(data); - $(".section-status").each(function(){ - $(this).update_section_progress(data); - }); - //For each question in section, check answer timestamp against currently displayed - var section_id = section.attr("id").split('-')[1]; - var num_questions = data.sections[section_id]["questions"].length; - for (var i = 0; i < num_questions; i++) { - question_id = data.sections[section_id]["questions"][i]; - //If timestamp newer than displayed, update answers - if ($.fn.update_timestamp(question_id, data)) { - $.fn.update_answer(question_id); - } - } - section.find(".loading").hide(); - section.find(".loaded").show(); - }); - }).on('hide', function(){ - var section = $(this); - // Only attempt unlock if there are forms on the page (not read-only) - if ($('.question-form').length > 0) { - var section_id = section.attr("id").split('-')[1]; - // LIBDMP-137 - // Changed post request 'unlock_section' to 'unlock_section.json'. 'unlock_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('unlock_section.json', {section_id: section_id}); - - if ($.fn.is_dirty(section_id)) { - $('#unsaved-answers-'+section_id).text(""); - $.each($.fn.get_unsaved_questions(section_id), function(index, question_text){ - $('#unsaved-answers-'+section_id).append("
  • "+question_text+"
    • "); - }); - $('#section-' + section_id + '-collapse-alert').modal(); - } - } - }); - - $(".cancel-section-collapse").click(function () { - var section_id = $(this).attr('data-section'); - $("#collapse-" + section_id).collapse("show"); - $('#section-' + section_id + '-collapse-alert').modal("hide"); - }); - - $(".discard-section-collapse").click(function () { - var section_id = $(this).attr('data-section'); - $('#section-' + section_id + '-collapse-alert').modal("hide"); - }); - - $(".save-section-collapse").click(function () { - var section_id = $(this).attr('data-section'); - $("#collapse-" + section_id).find("input[type='submit']").click(); - $('#section-' + section_id + '-collapse-alert').modal("hide"); - }); - - $("select, :radio, :checkbox, input").change(function() { - $(this).closest(".accordion-group").find(".section-status:first").toggle_dirty($(this).closest("form.answer").find(".question_id").val(), true); - }); - - // COMMENTS Javascript - - //action for show comment block on the right side of a question - $('.comments_accordion_button').click(function(e){ - var q_id = $(this).closest(".question_right_column_nav").find(".question_id").val(); - $(this).parent().addClass("active"); - $(this).closest(".question_right_column_ul").find(".guidance_tab_class").removeClass("active"); - $('#guidance-question-area-'+ q_id).hide(); - $('#comment-question-area-'+ q_id).show(); - e.preventDefault(); - }); - - //action for show guidance block on the right side of a question - $('.guidance_accordion_button').click(function(e){ - var q_id = $(this).closest(".question_right_column_nav").find(".question_id").val(); - $(this).parent().addClass("active"); - $(this).closest(".question_right_column_ul").find(".comment_tab_class").removeClass("active"); - $('#comment-question-area-'+ q_id).hide(); - $('#guidance-question-area-'+ q_id).show(); - e.preventDefault(); - }); - - //action for show add comment block - $('.add_comment_button').click(function(e){ - var q_id = $(this).closest(".comment-area").find(".question_id").val(); - $('.view_comment_class').hide(); - $('.edit_comment_class').hide(); - $('.archive_comment_class').hide(); - $('#add_comment_button_bottom_div_'+ q_id).hide(); - $('#add_comment_button_top_div_'+ q_id).hide(); - $('#add_comment_block_div_'+ q_id).show(); - e.preventDefault(); - }); - - //submit new comment button - $('.new_comment_submit_button').click(function(e){ - var q_id = $(this).parent().children(".question_id").val(); - var s_id = $(this).parent().children(".section_id").val(); - - $("#collapse-" + s_id).children(".accordion-inner").find(".saving").show(); - $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); - $(".alert-notice").hide(); - $("#new_comment_form_" + q_id).submit(); - - }); - - //action to view a comment block - $('.view_comment_button').click(function(e){ - var c_id = $(this).next(".comment_id").val(); - var q_id = $(this).closest(".comment-area").find(".question_id").val(); - $('.view_comment_class').hide(); - $('.edit_comment_class').hide(); - $('.archive_comment_class').hide(); - $('#lastet_comment_div_'+ q_id).hide(); - $('#edit_comment_div_'+ c_id).hide(); - $('#archive_comment_div_'+ c_id).hide(); - $('#add_comment_block_div_'+ q_id).hide(); - $('#view_comment_div_'+ c_id).show(); - $('#add_comment_button_bottom_div_'+ q_id).show(); - $('#add_comment_button_top_div_'+ q_id).show(); - e.preventDefault(); - }); - - //action to edit a comment block - $('.edit_comment_button').click(function(e){ - var c_id = $(this).prev(".comment_id").val(); - var q_id = $(this).closest(".comment-area").find(".question_id").val(); - $('.edit_comment_class').hide(); - $('.view_comment_class').hide(); - $('.archive_comment_class').hide(); - $('#lastet_comment_div_'+ q_id).hide(); - $('#view_comment_div_'+ c_id).hide(); - $('#archive_comment_div_'+ c_id).hide(); - $('#add_comment_block_div_'+ q_id).hide(); - $('#edit_comment_div_'+ c_id).show(); - $('#add_comment_button_bottom_div_'+ q_id).show(); - $('#add_comment_button_top_div_'+ q_id).show(); - e.preventDefault(); - }); - - //submit edit comment button - $('.edit_comment_submit_button').click(function(e){ - var c_id = $(this).parent().children(".comment_id").val(); - var s_id = $(this).parent().children(".section_id").val(); - - $("#collapse-" + s_id).children(".accordion-inner").find(".saving").show(); - $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); - $(".alert-notice").hide(); - $("#edit_comment_form_" + c_id).submit(); - - }); - - //action to archive a comment block - $('.archive_comment_button').click(function(e){ - var c_id = $(this).prev(".comment_id").val(); - var q_id = $(this).closest(".comment-area").find(".question_id").val(); - $('.edit_comment_class').hide(); - $('.view_comment_class').hide(); - $('.archive_comment_class').hide(); - $('#view_comment_div_'+ c_id).hide(); - $('#lastet_comment_div_'+ q_id).hide(); - $('#edit_comment_div_'+ c_id).hide(); - $('#add_comment_block_div_'+ q_id).hide(); - $('#archive_comment_div_'+ c_id).show() - $('#add_comment_button_bottom_div_'+ q_id).show(); - $('#add_comment_button_top_div_'+ q_id).show(); - e.preventDefault(); - }); - - //submit archived comment button - $('.archive_comment_submit_button').click(function(e){ - var c_id = $(this).parent().children(".comment_id").val(); - var s_id = $(this).parent().children(".section_id").val(); - - $("#collapse-" + s_id).children(".accordion-inner").find(".removing").show(); - $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); - $(".alert-notice").hide(); - $("#archive_comment_form_" + c_id).submit(); - - }); - - //action to cancel archive block - $(".cancel_archive_comment").click(function(e){ - var c_id = $(this).prev(".comment_id").val(); - $('.archive_comment_class').hide(); - $('#view_comment_div_'+ c_id).show(); - e.preventDefault(); - }); - -}); - -$.fn.get_unsaved_questions = function(section_id) { - if (section_id != null) { - var questions = new Array(); - $.each(dirty[section_id], function(question_id,value){ - if (value && question_id != 'undefined') { - questions.push($("label[for='answer-text-"+question_id+"']").text()); - } - }); - return questions; - } - else { - var questions = {}; - $.each(dirty, function(section_id,question_ids){ - var section_text = $("#section-header-"+section_id).clone().children().remove().end().text().trim(); - questions[section_text] = new Array(); - $.each(question_ids, function(question_id,value){ - if (value && question_id != 'undefined') { - questions[section_text].push($("label[for='answer-text-"+question_id+"']").text()); - } - }); - }); - return questions; - } - - -}; - -$.fn.is_dirty = function(section_id, question_id) { - if (section_id != null) { - if (dirty[section_id] != null) { - if (question_id != null) { - if (dirty[section_id][question_id] != null) { - return dirty[section_id][question_id]; - } - else { - return false; - } - } - else { - var is_dirty = false; - $.each(dirty[section_id], function(question_id, value){ - if (value && question_id != 'undefined') { - is_dirty = true; - } - }); - return is_dirty; - } - } - } - else { - var is_dirty = false; - $.each(dirty, function(section_id, questions){ - $.each(questions, function(question_id, value){ - if (value && question_id != 'undefined') { - is_dirty = true; - } - }); - }); - return is_dirty; - } - return false; -}; - -$.fn.update_answer = function(question_id) { - $.ajax({ - type: 'GET', - url: "answer.json?q_id="+question_id, - dataType: 'json', - async: false, //Needs to be synchronous, otherwise end up mixing up answers - success: function(data) { - if (data != null) { - //Get divs containing the form and readonly versions - var form_div = $("#question-form-"+question_id); - var readonly_div = $("#question-readonly-"+question_id); - //Look for textfields - if ($("input#answer-text-"+question_id).length == 1) { - $("input#answer-text-"+question_id).val(data.text); - readonly_div.find('.answer-text-readonly').html("

    "+data.text+"

    "); - } - else { - //Update answer text - both in textarea and readonly - $('#answer-text-'+question_id).val(data.text); - tinymce.get('answer-text-'+question_id).setContent(data.text); - readonly_div.find('.answer-text-readonly').html(data.text); - } - //Update answer options - both in form and readonly - num_options = data.options.length; - form_div.find('option').each(function(){ - var selected = false; - for (var j =0; j < num_options; j++) { - if ($(this).val() == data.options[j].id) { - selected = true; - } - } - if (selected) { - $(this).attr('selected', 'selected'); - } - else { - $(this).removeAttr('selected'); - } - }); - form_div.find(':checkbox,:radio').each(function(){ - var selected = false; - for (var j =0; j < num_options; j++) { - if ($(this).val() == data.options[j].id) { - selected = true; - } - } - if (selected) { - $(this).attr('checked', 'checked'); - } - else { - $(this).removeAttr('checked'); - } - }); - - var list_string = ""; - for (var j =0; j < num_options; j++) { - list_string += "
  • "+data.options[j].text+"
    • "; - } - readonly_div.find('.options').html(list_string); - form_div.closest(".accordion-group").find(".section-status:first").toggle_dirty(question_id, false); - } - } - }); - -}; - -$.fn.update_section_progress = function(data) { - s_id = $(this).attr("id").split('-')[0]; - s_qs = data.sections[s_id]["num_questions"]; - question_word = "questions" - if (s_qs == 1) { - question_word = "question"; - } - s_as = data.sections[s_id]["num_answers"]; - $(this).text("("+s_qs+" "+question_word+", "+s_as+" answered)"); - if (s_qs == s_as) { - $(this).removeClass("label-warning"); - $(this).addClass("label-info"); - } -}; - -$.fn.update_plan_progress = function(data) { - $("#questions-progress").css("width", (data.num_answers/data.num_questions*100)+"%"); - $("#questions-progress-title").text(data.num_answers+"/"+data.num_questions + " " + I18n.t("helpers.project.questions_answered")); - $('#export-progress').css('width', data.space_used + '%'); - $("#export-progress-title").text(I18n.t("helpers.plan.export.space_used_without_max", {space_used: data.space_used})); - if (data.space_used >= 100) { - $('#export-progress').removeClass("space"); - $('#export-progress').addClass("full"); - $('#export-progress-title').addClass("bar-full-text"); - } - else { - $('#export-progress').removeClass("full"); - $('#export-progress').addClass("space"); - $('#export-progress-title').removeClass("bar-full-text"); - } -}; - -$.fn.update_timestamp = function(question_id, data) { - q_status = $('#'+question_id+'-status'); - var t = q_status.children("abbr:first"); - var current_timestamp = new Date(t.attr('data-time')); - var timestamp = data.questions[question_id]["answer_created_at"]; - if (timestamp != null) { - timestamp = new Date(Number(timestamp) * 1000); - if (timestamp.getTime() != current_timestamp.getTime()) { - q_status.text(""); - q_status.append(I18n.t("helpers.answered_by") + " " + I18n.t("helpers.answered_by_part2") + " " + data.questions[question_id]["answered_by"]); - t = q_status.children("abbr:first"); - // Update label to indicate successful submission - q_status.removeClass("label-info label-warning"); - q_status.addClass("label-success"); - // Set timestamp text and data - t.text(timestamp.toUTCString()); - t.attr('title', timestamp.toISOString()).data("timeago",null).timeago(); - t.attr('data-time', timestamp.toISOString()); - return true; - } - } - return false; -}; - -$.fn.check_section_lock = function() { - var section = $(this); - var section_id = section.attr("id").split('-')[1]; - $.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(); - section.find("input").attr('disabled', 'disabled'); - section.find(".question-form").hide(); - section.find("select").attr('disabled', 'disabled'); - section.find(".question-readonly").show(); - } - else { - // 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', {section_id: section_id} ); - section.find(".section-lock-notice").html(""); - section.find(".section-lock-notice").hide(); - section.find("input").removeAttr('disabled'); - section.find(".question-form").show(); - section.find("select").removeAttr('disabled'); - section.find(".question-readonly").hide(); - } - }); - return true; -}; - -$.fn.toggle_dirty = function(question_id, is_dirty) { - section_id = $(this).attr("id").split('-')[0]; - if (dirty[section_id] == null) { - dirty[section_id] = {}; - } - dirty[section_id][question_id] = is_dirty; - if (is_dirty) { - $("#"+question_id+"-unsaved").show(); - - } - else { - $("#"+question_id+"-unsaved").hide(); - } -}; - -$.fn.check_textarea = function(editor) { - $("#"+editor.id).closest(".accordion-group").find(".section-status:first").toggle_dirty(editor.id.split('-')[2], editor.isDirty()); - -}; - - - - - +//= require jquery.timeago.js +//= require tinymce + +var dirty = {}; + + + +$( document ).ready(function() { + + //reload page back to where it was before committing comment + + if($('#comment_section_id').length) { + var section_id = $('#comment_section_id').val(); + + $("#collapse-" + section_id).addClass("in"); + $("#collapse-" + section_id).children(".accordion-inner").find(".loading").show(); + $("#collapse-" + section_id).children(".accordion-inner").find(".loaded").hide(); + + setTimeout(function(){ + $("loaded").find(".section-lock-notice").html(""); + $("loaded").find(".section-lock-notice").hide(); + $(".question-form").find("select").removeAttr('disabled'); + $(".question-div").find(".question-readonly").hide(); + $(".question-div").find(".question-form").show(); + + $("#collapse-" + section_id).children(".accordion-inner").find(".loading").hide(); + $("#collapse-" + section_id).children(".accordion-inner").find(".loaded").show(); + $('html, body').animate({ + 'scrollTop': $("#current_question").offset().top + },1000); + },8000); + } + + window.onbeforeunload = function(){ + var message = null; + if ($.fn.is_dirty()) { + var questions = $.fn.get_unsaved_questions(); + message = I18n.t("you_have_unsaved_in_sections"); + $.each(questions, function(section_text, question_texts){ + message += "\n\u2022"+section_text; + }); + return message; + } + }; + + // Make timestamps readable + $('abbr.timeago').timeago(); + + // Update status messages on form submission + $("form.answer").submit(function(){ + var submit_button = $(this).find('input[type="submit"]'); + var saving_message = $(this).find('.saving-message'); + submit_button.parent().hide(); + q_id = $(this).find(".question_id").val(); + saving_message.show(); + s_status = $(this).closest(".accordion-group").find(".section-status:first"); + s_status.toggle_dirty(q_id, false); + // Allow quarter of a second for database to update + timeout = setTimeout(function(){ + $.getJSON("status.json", function(data) { + $.fn.update_plan_progress(data); + $.fn.update_timestamp(q_id, data); + s_status.update_section_progress(data); + submit_button.parent().show(); + saving_message.hide(); + }); + },250); + }); + + //accordion guidance + $('.accordion-guidance-link').on('click', function (e) { + e.stopPropagation(); + var show = true; + var div_to_toggle = $($(this).attr("href")); + if (div_to_toggle.hasClass('in')) { + show = false; + } + $($(this).attr("href")).toggleClass("in"); + if (show) { + $(this).children(".plus-laranja").removeClass("plus-laranja").addClass("minus-laranja"); + } + else { + $(this).children(".minus-laranja").removeClass("minus-laranja").addClass("plus-laranja"); + } + delete show; + delete div_to_toggle; + e.preventDefault(); + }); + + // Periodically check locks on open section - every 50 seconds + setInterval(function(){ + // Only lock/unlock if there are forms on the page (not read-only) + if ($('.question-form').length > 0) { + section = $('.section-collapse.in'); + if (section.length > 0) { + section.check_section_lock(); + } + } + }, 50000); + + // Handle section actions on accordion expansion/collapse + $('.section-collapse').on('show', function() { + var section = $(this); + section.find(".loaded").hide(); + section.find(".loading").show(); + // Only lock if there are forms on the page (not read-only) + if ($('.question-form').length > 0) { + section.check_section_lock(); + } + // check for updated answers + $.getJSON("status.json", function(data) { + $.fn.update_plan_progress(data); + $(".section-status").each(function(){ + $(this).update_section_progress(data); + }); + //For each question in section, check answer timestamp against currently displayed + var section_id = section.attr("id").split('-')[1]; + var num_questions = data.sections[section_id]["questions"].length; + for (var i = 0; i < num_questions; i++) { + question_id = data.sections[section_id]["questions"][i]; + //If timestamp newer than displayed, update answers + if ($.fn.update_timestamp(question_id, data)) { + $.fn.update_answer(question_id); + } + } + section.find(".loading").hide(); + section.find(".loaded").show(); + }); + }).on('hide', function(){ + var section = $(this); + // Only attempt unlock if there are forms on the page (not read-only) + if ($('.question-form').length > 0) { + var section_id = section.attr("id").split('-')[1]; + // LIBDMP-137 + // Changed post request 'unlock_section' to 'unlock_section.json'. 'unlock_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('unlock_section.json', {section_id: section_id}); + + if ($.fn.is_dirty(section_id)) { + $('#unsaved-answers-'+section_id).text(""); + $.each($.fn.get_unsaved_questions(section_id), function(index, question_text){ + $('#unsaved-answers-'+section_id).append("
  • "+question_text+"
    • "); + }); + $('#section-' + section_id + '-collapse-alert').modal(); + } + } + }); + + $(".cancel-section-collapse").click(function () { + var section_id = $(this).attr('data-section'); + $("#collapse-" + section_id).collapse("show"); + $('#section-' + section_id + '-collapse-alert').modal("hide"); + }); + + $(".discard-section-collapse").click(function () { + var section_id = $(this).attr('data-section'); + $('#section-' + section_id + '-collapse-alert').modal("hide"); + }); + + $(".save-section-collapse").click(function () { + var section_id = $(this).attr('data-section'); + $("#collapse-" + section_id).find("input[type='submit']").click(); + $('#section-' + section_id + '-collapse-alert').modal("hide"); + }); + + $("select, :radio, :checkbox, input").change(function() { + $(this).closest(".accordion-group").find(".section-status:first").toggle_dirty($(this).closest("form.answer").find(".question_id").val(), true); + }); + + // COMMENTS Javascript + + //action for show comment block on the right side of a question + $('.comments_accordion_button').click(function(e){ + var q_id = $(this).closest(".question_right_column_nav").find(".question_id").val(); + $(this).parent().addClass("active"); + $(this).closest(".question_right_column_ul").find(".guidance_tab_class").removeClass("active"); + $('#guidance-question-area-'+ q_id).hide(); + $('#comment-question-area-'+ q_id).show(); + e.preventDefault(); + }); + + //action for show guidance block on the right side of a question + $('.guidance_accordion_button').click(function(e){ + var q_id = $(this).closest(".question_right_column_nav").find(".question_id").val(); + $(this).parent().addClass("active"); + $(this).closest(".question_right_column_ul").find(".comment_tab_class").removeClass("active"); + $('#comment-question-area-'+ q_id).hide(); + $('#guidance-question-area-'+ q_id).show(); + e.preventDefault(); + }); + + //action for show add comment block + $('.add_comment_button').click(function(e){ + var q_id = $(this).closest(".comment-area").find(".question_id").val(); + $('.view_comment_class').hide(); + $('.edit_comment_class').hide(); + $('.archive_comment_class').hide(); + $('#add_comment_button_bottom_div_'+ q_id).hide(); + $('#add_comment_button_top_div_'+ q_id).hide(); + $('#add_comment_block_div_'+ q_id).show(); + e.preventDefault(); + }); + + //submit new comment button + $('.new_comment_submit_button').click(function(e){ + var q_id = $(this).parent().children(".question_id").val(); + var s_id = $(this).parent().children(".section_id").val(); + + $("#collapse-" + s_id).children(".accordion-inner").find(".saving").show(); + $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); + $(".alert-notice").hide(); + $("#new_comment_form_" + q_id).submit(); + + }); + + //action to view a comment block + $('.view_comment_button').click(function(e){ + var c_id = $(this).next(".comment_id").val(); + var q_id = $(this).closest(".comment-area").find(".question_id").val(); + $('.view_comment_class').hide(); + $('.edit_comment_class').hide(); + $('.archive_comment_class').hide(); + $('#lastet_comment_div_'+ q_id).hide(); + $('#edit_comment_div_'+ c_id).hide(); + $('#archive_comment_div_'+ c_id).hide(); + $('#add_comment_block_div_'+ q_id).hide(); + $('#view_comment_div_'+ c_id).show(); + $('#add_comment_button_bottom_div_'+ q_id).show(); + $('#add_comment_button_top_div_'+ q_id).show(); + e.preventDefault(); + }); + + //action to edit a comment block + $('.edit_comment_button').click(function(e){ + var c_id = $(this).prev(".comment_id").val(); + var q_id = $(this).closest(".comment-area").find(".question_id").val(); + $('.edit_comment_class').hide(); + $('.view_comment_class').hide(); + $('.archive_comment_class').hide(); + $('#lastet_comment_div_'+ q_id).hide(); + $('#view_comment_div_'+ c_id).hide(); + $('#archive_comment_div_'+ c_id).hide(); + $('#add_comment_block_div_'+ q_id).hide(); + $('#edit_comment_div_'+ c_id).show(); + $('#add_comment_button_bottom_div_'+ q_id).show(); + $('#add_comment_button_top_div_'+ q_id).show(); + e.preventDefault(); + }); + + //submit edit comment button + $('.edit_comment_submit_button').click(function(e){ + var c_id = $(this).parent().children(".comment_id").val(); + var s_id = $(this).parent().children(".section_id").val(); + + $("#collapse-" + s_id).children(".accordion-inner").find(".saving").show(); + $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); + $(".alert-notice").hide(); + $("#edit_comment_form_" + c_id).submit(); + + }); + + //action to archive a comment block + $('.archive_comment_button').click(function(e){ + var c_id = $(this).prev(".comment_id").val(); + var q_id = $(this).closest(".comment-area").find(".question_id").val(); + $('.edit_comment_class').hide(); + $('.view_comment_class').hide(); + $('.archive_comment_class').hide(); + $('#view_comment_div_'+ c_id).hide(); + $('#lastet_comment_div_'+ q_id).hide(); + $('#edit_comment_div_'+ c_id).hide(); + $('#add_comment_block_div_'+ q_id).hide(); + $('#archive_comment_div_'+ c_id).show() + $('#add_comment_button_bottom_div_'+ q_id).show(); + $('#add_comment_button_top_div_'+ q_id).show(); + e.preventDefault(); + }); + + //submit archived comment button + $('.archive_comment_submit_button').click(function(e){ + var c_id = $(this).parent().children(".comment_id").val(); + var s_id = $(this).parent().children(".section_id").val(); + + $("#collapse-" + s_id).children(".accordion-inner").find(".removing").show(); + $("#collapse-" + s_id).children(".accordion-inner").find(".loaded").hide(); + $(".alert-notice").hide(); + $("#archive_comment_form_" + c_id).submit(); + + }); + + //action to cancel archive block + $(".cancel_archive_comment").click(function(e){ + var c_id = $(this).prev(".comment_id").val(); + $('.archive_comment_class').hide(); + $('#view_comment_div_'+ c_id).show(); + e.preventDefault(); + }); + +}); + +$.fn.get_unsaved_questions = function(section_id) { + if (section_id != null) { + var questions = new Array(); + $.each(dirty[section_id], function(question_id,value){ + if (value && question_id != 'undefined') { + questions.push($("label[for='answer-text-"+question_id+"']").text()); + } + }); + return questions; + } + else { + var questions = {}; + $.each(dirty, function(section_id,question_ids){ + var section_text = $("#section-header-"+section_id).clone().children().remove().end().text().trim(); + questions[section_text] = new Array(); + $.each(question_ids, function(question_id,value){ + if (value && question_id != 'undefined') { + questions[section_text].push($("label[for='answer-text-"+question_id+"']").text()); + } + }); + }); + return questions; + } + + +}; + +$.fn.is_dirty = function(section_id, question_id) { + if (section_id != null) { + if (dirty[section_id] != null) { + if (question_id != null) { + if (dirty[section_id][question_id] != null) { + return dirty[section_id][question_id]; + } + else { + return false; + } + } + else { + var is_dirty = false; + $.each(dirty[section_id], function(question_id, value){ + if (value && question_id != 'undefined') { + is_dirty = true; + } + }); + return is_dirty; + } + } + } + else { + var is_dirty = false; + $.each(dirty, function(section_id, questions){ + $.each(questions, function(question_id, value){ + if (value && question_id != 'undefined') { + is_dirty = true; + } + }); + }); + return is_dirty; + } + return false; +}; + +$.fn.update_answer = function(question_id) { + $.ajax({ + type: 'GET', + url: "answer.json?q_id="+question_id, + dataType: 'json', + async: false, //Needs to be synchronous, otherwise end up mixing up answers + success: function(data) { + if (data != null) { + //Get divs containing the form and readonly versions + var form_div = $("#question-form-"+question_id); + var readonly_div = $("#question-readonly-"+question_id); + //Look for textfields + if ($("input#answer-text-"+question_id).length == 1) { + $("input#answer-text-"+question_id).val(data.text); + readonly_div.find('.answer-text-readonly').html("

    "+data.text+"

    "); + } + else { + //Update answer text - both in textarea and readonly + $('#answer-text-'+question_id).val(data.text); + tinymce.get('answer-text-'+question_id).setContent(data.text); + readonly_div.find('.answer-text-readonly').html(data.text); + } + //Update answer options - both in form and readonly + num_options = data.options.length; + form_div.find('option').each(function(){ + var selected = false; + for (var j =0; j < num_options; j++) { + if ($(this).val() == data.options[j].id) { + selected = true; + } + } + if (selected) { + $(this).attr('selected', 'selected'); + } + else { + $(this).removeAttr('selected'); + } + }); + form_div.find(':checkbox,:radio').each(function(){ + var selected = false; + for (var j =0; j < num_options; j++) { + if ($(this).val() == data.options[j].id) { + selected = true; + } + } + if (selected) { + $(this).attr('checked', 'checked'); + } + else { + $(this).removeAttr('checked'); + } + }); + + var list_string = ""; + for (var j =0; j < num_options; j++) { + list_string += "
  • "+data.options[j].text+"
    • "; + } + readonly_div.find('.options').html(list_string); + form_div.closest(".accordion-group").find(".section-status:first").toggle_dirty(question_id, false); + } + } + }); + +}; + +$.fn.update_section_progress = function(data) { + s_id = $(this).attr("id").split('-')[0]; + s_qs = data.sections[s_id]["num_questions"]; + question_word = "questions" + if (s_qs == 1) { + question_word = "question"; + } + s_as = data.sections[s_id]["num_answers"]; + $(this).text("("+s_qs+" "+question_word+", "+s_as+" answered)"); + if (s_qs == s_as) { + $(this).removeClass("label-warning"); + $(this).addClass("label-info"); + } +}; + +$.fn.update_plan_progress = function(data) { + $("#questions-progress").css("width", (data.num_answers/data.num_questions*100)+"%"); + $("#questions-progress-title").text(data.num_answers+"/"+data.num_questions + " " + I18n.t("helpers.project.questions_answered")); + $('#export-progress').css('width', data.space_used + '%'); + $("#export-progress-title").text(I18n.t("helpers.plan.export.space_used_without_max", {space_used: data.space_used})); + if (data.space_used >= 100) { + $('#export-progress').removeClass("space"); + $('#export-progress').addClass("full"); + $('#export-progress-title').addClass("bar-full-text"); + } + else { + $('#export-progress').removeClass("full"); + $('#export-progress').addClass("space"); + $('#export-progress-title').removeClass("bar-full-text"); + } +}; + +$.fn.update_timestamp = function(question_id, data) { + q_status = $('#'+question_id+'-status'); + var t = q_status.children("abbr:first"); + var current_timestamp = new Date(t.attr('data-time')); + var timestamp = data.questions[question_id]["answer_created_at"]; + if (timestamp != null) { + timestamp = new Date(Number(timestamp) * 1000); + if (timestamp.getTime() != current_timestamp.getTime()) { + q_status.text(""); + q_status.append(I18n.t("helpers.answered_by") + " " + I18n.t("helpers.answered_by_part2") + " " + data.questions[question_id]["answered_by"]); + t = q_status.children("abbr:first"); + // Update label to indicate successful submission + q_status.removeClass("label-info label-warning"); + q_status.addClass("label-success"); + // Set timestamp text and data + t.text(timestamp.toUTCString()); + t.attr('title', timestamp.toISOString()).data("timeago",null).timeago(); + t.attr('data-time', timestamp.toISOString()); + return true; + } + } + return false; +}; + +$.fn.check_section_lock = function() { + var section = $(this); + var section_id = section.attr("id").split('-')[1]; + $.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(); + section.find("input").attr('disabled', 'disabled'); + section.find(".question-form").hide(); + section.find("select").attr('disabled', 'disabled'); + section.find(".question-readonly").show(); + } + else { + // 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', {section_id: section_id} ); + section.find(".section-lock-notice").html(""); + section.find(".section-lock-notice").hide(); + section.find("input").removeAttr('disabled'); + section.find(".question-form").show(); + section.find("select").removeAttr('disabled'); + section.find(".question-readonly").hide(); + } + }); + return true; +}; + +$.fn.toggle_dirty = function(question_id, is_dirty) { + section_id = $(this).attr("id").split('-')[0]; + if (dirty[section_id] == null) { + dirty[section_id] = {}; + } + dirty[section_id][question_id] = is_dirty; + if (is_dirty) { + $("#"+question_id+"-unsaved").show(); + + } + else { + $("#"+question_id+"-unsaved").hide(); + } +}; + +$.fn.check_textarea = function(editor) { + $("#"+editor.id).closest(".accordion-group").find(".section-status:first").toggle_dirty(editor.id.split('-')[2], editor.isDirty()); + +}; + + + + + diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js index 72bc364..c103f84 100644 --- a/app/assets/javascripts/projects.js +++ b/app/assets/javascripts/projects.js @@ -1,169 +1,169 @@ -$( document ).ready(function() { - -/* - $("#project_funder_id").select2({ - placeholder: "Select a funder" - }); -*/ - $("#project_funder_id").change(function () { - update_template_options(); - update_guidance_options(); - if ($(this).val().length > 0) { - $("#other-funder-name").hide(); - $("#project_funder_name").val(""); - } - else { - $("#other-funder-name").show(); - } - $("#institution-control-group").show(); - $("#create-plan-button").show(); - $("#confirm-funder").text($("#project_funder_id").select2('data').text); - }); - - $("#no-funder").click(function(e) { - e.preventDefault(); - $("#project_funder_id").select2("val", ""); - update_template_options(); - update_guidance_options(); - $("#institution-control-group").show(); - $("#create-plan-button").show(); - $("#other-funder-name").show(); - $("#confirm-funder").text(I18n.t("helpers.none")); - }); - - $("#project_funder_name").change(function(){ - $("#confirm-funder").text($(this).val()); - }); - - $("#project_institution_id").change(function () { - update_template_options(); - update_guidance_options(); - $("#confirm-institution").text($("#project_institution_id").select2('data').text); - }); - - $("#no-institution").click(function() { - $("#project_institution_id").select2("val", ""); - update_template_options(); - update_guidance_options(); - $("#confirm-institution").text(I18n.t("helpers.none")); - }); - - $("#project_dmptemplate_id").change(function (f) { - update_guidance_options(); - $("#confirm-template").text($("#project_dmptemplate_id :selected").text()); - }); - - $("#project-confirmation-dialog").on("show", function(){ - if ($("#confirm-institution").text() == "") { - $("#confirm-institution").text(I18n.t("helpers.none")); - } - if ($("#confirm-funder").text() == "") { - $("#confirm-funder").text(I18n.t("helpers.none")); - } - if ($("#confirm-template").text() == "") { - $("#confirm-template").closest("div").hide(); - } - else { - $("#confirm-template").closest("div").show(); - } - $("#confirm-guidance").empty(); - $("input:checked").each(function(){ - $("#confirm-guidance").append("
  • "+$(this).parent().text()+"
    • "); - }); - $('.select2-choice').hide(); - }); - - $("#new-project-cancelled").click(function (){ - $("#project-confirmation-dialog").modal("hide"); - $('.select2-choice').show(); - }); - - $("#new-project-confirmed").click(function (){ - $("#new_project").submit(); - }); - - //for the default template alert - $("#default-template-confirmation-dialog").on("show", function(){ - $('.select2-choice').hide(); - }); - - $("#default-template-cancelled").click(function (){ - $("#default-template-confirmation-dialog").modal("hide"); - $('.select2-choice').show(); - }); - - $("#default-template-confirmed").click(function (){ - $("#default_tag").val('true'); - $("#new_project").submit(); - }); - - - function update_template_options() { - var options = {}; - var funder = $("#project_funder_id").select2('val'); - var institution = $("#project_institution_id").select2('val'); - $.ajax({ - type: 'GET', - url: "possible_templates.json?institution="+institution+"&funder="+funder, - dataType: 'json', - async: false, //Needs to be synchronous, otherwise end up mixing up answers - success: function(data) { - options = data; - } - }); - select_element = $("#project_dmptemplate_id"); - select_element.find("option").remove(); - var count = 0; - for (var id in options) { - if (count == 0) { - select_element.append(""); - } - else { - select_element.append(""); - } - count++; - } - if (count >= 2) { - $("#template-control-group").show(); - } - else { - $("#template-control-group").hide(); - } - $("#confirm-template").text(""); - $("#project_dmptemplate_id").change(); - } - - 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, - dataType: 'json', - 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("
    • "); - count++; - } - if (count > 0) { - $("#guidance-control-group").show(); - } - else { - $("#guidance-control-group").hide(); - } - } -}); +$( document ).ready(function() { + +/* + $("#project_funder_id").select2({ + placeholder: "Select a funder" + }); +*/ + $("#project_funder_id").change(function () { + update_template_options(); + update_guidance_options(); + if ($(this).val().length > 0) { + $("#other-funder-name").hide(); + $("#project_funder_name").val(""); + } + else { + $("#other-funder-name").show(); + } + $("#institution-control-group").show(); + $("#create-plan-button").show(); + $("#confirm-funder").text($("#project_funder_id").select2('data').text); + }); + + $("#no-funder").click(function(e) { + e.preventDefault(); + $("#project_funder_id").select2("val", ""); + update_template_options(); + update_guidance_options(); + $("#institution-control-group").show(); + $("#create-plan-button").show(); + $("#other-funder-name").show(); + $("#confirm-funder").text(I18n.t("helpers.none")); + }); + + $("#project_funder_name").change(function(){ + $("#confirm-funder").text($(this).val()); + }); + + $("#project_institution_id").change(function () { + update_template_options(); + update_guidance_options(); + $("#confirm-institution").text($("#project_institution_id").select2('data').text); + }); + + $("#no-institution").click(function() { + $("#project_institution_id").select2("val", ""); + update_template_options(); + update_guidance_options(); + $("#confirm-institution").text(I18n.t("helpers.none")); + }); + + $("#project_dmptemplate_id").change(function (f) { + update_guidance_options(); + $("#confirm-template").text($("#project_dmptemplate_id :selected").text()); + }); + + $("#project-confirmation-dialog").on("show", function(){ + if ($("#confirm-institution").text() == "") { + $("#confirm-institution").text(I18n.t("helpers.none")); + } + if ($("#confirm-funder").text() == "") { + $("#confirm-funder").text(I18n.t("helpers.none")); + } + if ($("#confirm-template").text() == "") { + $("#confirm-template").closest("div").hide(); + } + else { + $("#confirm-template").closest("div").show(); + } + $("#confirm-guidance").empty(); + $("input:checked").each(function(){ + $("#confirm-guidance").append("
  • "+$(this).parent().text()+"
    • "); + }); + $('.select2-choice').hide(); + }); + + $("#new-project-cancelled").click(function (){ + $("#project-confirmation-dialog").modal("hide"); + $('.select2-choice').show(); + }); + + $("#new-project-confirmed").click(function (){ + $("#new_project").submit(); + }); + + //for the default template alert + $("#default-template-confirmation-dialog").on("show", function(){ + $('.select2-choice').hide(); + }); + + $("#default-template-cancelled").click(function (){ + $("#default-template-confirmation-dialog").modal("hide"); + $('.select2-choice').show(); + }); + + $("#default-template-confirmed").click(function (){ + $("#default_tag").val('true'); + $("#new_project").submit(); + }); + + + function update_template_options() { + var options = {}; + var funder = $("#project_funder_id").select2('val'); + var institution = $("#project_institution_id").select2('val'); + $.ajax({ + type: 'GET', + url: "possible_templates.json?institution="+institution+"&funder="+funder, + dataType: 'json', + async: false, //Needs to be synchronous, otherwise end up mixing up answers + success: function(data) { + options = data; + } + }); + select_element = $("#project_dmptemplate_id"); + select_element.find("option").remove(); + var count = 0; + for (var id in options) { + if (count == 0) { + select_element.append(""); + } + else { + select_element.append(""); + } + count++; + } + if (count >= 2) { + $("#template-control-group").show(); + } + else { + $("#template-control-group").hide(); + } + $("#confirm-template").text(""); + $("#project_dmptemplate_id").change(); + } + + 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, + dataType: 'json', + 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("
    • "); + count++; + } + if (count > 0) { + $("#guidance-control-group").show(); + } + else { + $("#guidance-control-group").hide(); + } + } +}); diff --git a/app/assets/javascripts/select2.min.js b/app/assets/javascripts/select2.min.js index f5e3013..1aa2d30 100644 --- a/app/assets/javascripts/select2.min.js +++ b/app/assets/javascripts/select2.min.js @@ -1,22 +1,22 @@ -/* -Copyright 2012 Igor Vaynberg - -Version: 3.4.2 Timestamp: Mon Aug 12 15:04:12 PDT 2013 - -This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU -General Public License version 2 (the "GPL License"). You may choose either license to govern your -use of this software only upon the condition that you accept all of the terms of either the Apache -License or the GPL License. - -You may obtain a copy of the Apache License and the GPL License at: - -http://www.apache.org/licenses/LICENSE-2.0 -http://www.gnu.org/licenses/gpl-2.0.html - -Unless required by applicable law or agreed to in writing, software distributed under the Apache License -or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -either express or implied. See the Apache License and the GPL License for the specific language governing -permissions and limitations under the Apache License and the GPL License. -*/ -!function(a){"undefined"==typeof a.fn.each2&&a.extend(a.fn,{each2:function(b){for(var c=a([0]),d=-1,e=this.length;++dc;c++)e=a.charAt(c),b+=m[e]||e;return b}function o(a,b){for(var c=0,d=b.length;d>c;c+=1)if(q(a,b[c]))return c;return-1}function p(){var b=a(l);b.appendTo("body");var c={width:b.width()-b[0].clientWidth,height:b.height()-b[0].clientHeight};return b.remove(),c}function q(a,c){return a===c?!0:a===b||c===b?!1:null===a||null===c?!1:a.constructor===String?a+""==c+"":c.constructor===String?c+""==a+"":!1}function r(b,c){var d,e,f;if(null===b||b.length<1)return[];for(d=b.split(c),e=0,f=d.length;f>e;e+=1)d[e]=a.trim(d[e]);return d}function s(a){return a.outerWidth(!1)-a.width()}function t(c){var d="keyup-change-value";c.on("keydown",function(){a.data(c,d)===b&&a.data(c,d,c.val())}),c.on("keyup",function(){var e=a.data(c,d);e!==b&&c.val()!==e&&(a.removeData(c,d),c.trigger("keyup-change"))})}function u(c){c.on("mousemove",function(c){var d=i;(d===b||d.x!==c.pageX||d.y!==c.pageY)&&a(c.target).trigger("mousemove-filtered",c)})}function v(a,c,d){d=d||b;var e;return function(){var b=arguments;window.clearTimeout(e),e=window.setTimeout(function(){c.apply(d,b)},a)}}function w(a){var c,b=!1;return function(){return b===!1&&(c=a(),b=!0),c}}function x(a,b){var c=v(a,function(a){b.trigger("scroll-debounced",a)});b.on("scroll",function(a){o(a.target,b.get())>=0&&c(a)})}function y(a){a[0]!==document.activeElement&&window.setTimeout(function(){var d,b=a[0],c=a.val().length;a.focus(),a.is(":visible")&&b===document.activeElement&&(b.setSelectionRange?b.setSelectionRange(c,c):b.createTextRange&&(d=b.createTextRange(),d.collapse(!1),d.select()))},0)}function z(b){b=a(b)[0];var c=0,d=0;if("selectionStart"in b)c=b.selectionStart,d=b.selectionEnd-c;else if("selection"in document){b.focus();var e=document.selection.createRange();d=document.selection.createRange().text.length,e.moveStart("character",-b.value.length),c=e.text.length-d}return{offset:c,length:d}}function A(a){a.preventDefault(),a.stopPropagation()}function B(a){a.preventDefault(),a.stopImmediatePropagation()}function C(b){if(!h){var c=b[0].currentStyle||window.getComputedStyle(b[0],null);h=a(document.createElement("div")).css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,textTransform:c.textTransform,whiteSpace:"nowrap"}),h.attr("class","select2-sizer"),a("body").append(h)}return h.text(b.val()),h.width()}function D(b,c,d){var e,g,f=[];e=b.attr("class"),e&&(e=""+e,a(e.split(" ")).each2(function(){0===this.indexOf("select2-")&&f.push(this)})),e=c.attr("class"),e&&(e=""+e,a(e.split(" ")).each2(function(){0!==this.indexOf("select2-")&&(g=d(this),g&&f.push(this))})),b.attr("class",f.join(" "))}function E(a,b,c,d){var e=n(a.toUpperCase()).indexOf(n(b.toUpperCase())),f=b.length;return 0>e?(c.push(d(a)),void 0):(c.push(d(a.substring(0,e))),c.push(""),c.push(d(a.substring(e,e+f))),c.push(""),c.push(d(a.substring(e+f,a.length))),void 0)}function F(a){var b={"\\":"\","&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};return String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})}function G(c){var d,e=null,f=c.quietMillis||100,g=c.url,h=this;return function(i){window.clearTimeout(d),d=window.setTimeout(function(){var d=c.data,f=g,j=c.transport||a.fn.select2.ajaxDefaults.transport,k={type:c.type||"GET",cache:c.cache||!1,jsonpCallback:c.jsonpCallback||b,dataType:c.dataType||"json"},l=a.extend({},a.fn.select2.ajaxDefaults.params,k);d=d?d.call(h,i.term,i.page,i.context):null,f="function"==typeof f?f.call(h,i.term,i.page,i.context):f,e&&e.abort(),c.params&&(a.isFunction(c.params)?a.extend(l,c.params.call(h)):a.extend(l,c.params)),a.extend(l,{url:f,dataType:c.dataType,data:d,success:function(a){var b=c.results(a,i.page);i.callback(b)}}),e=j.call(h,l)},f)}}function H(b){var d,e,c=b,f=function(a){return""+a.text};a.isArray(c)&&(e=c,c={results:e}),a.isFunction(c)===!1&&(e=c,c=function(){return e});var g=c();return g.text&&(f=g.text,a.isFunction(f)||(d=g.text,f=function(a){return a[d]})),function(b){var g,d=b.term,e={results:[]};return""===d?(b.callback(c()),void 0):(g=function(c,e){var h,i;if(c=c[0],c.children){h={};for(i in c)c.hasOwnProperty(i)&&(h[i]=c[i]);h.children=[],a(c.children).each2(function(a,b){g(b,h.children)}),(h.children.length||b.matcher(d,f(h),c))&&e.push(h)}else b.matcher(d,f(c),c)&&e.push(c)},a(c().results).each2(function(a,b){g(b,e.results)}),b.callback(e),void 0)}}function I(c){var d=a.isFunction(c);return function(e){var f=e.term,g={results:[]};a(d?c():c).each(function(){var a=this.text!==b,c=a?this.text:this;(""===f||e.matcher(f,c))&&g.results.push(a?this:{id:this,text:this})}),e.callback(g)}}function J(b,c){if(a.isFunction(b))return!0;if(!b)return!1;throw new Error(c+" must be a function or a falsy value")}function K(b){return a.isFunction(b)?b():b}function L(b){var c=0;return a.each(b,function(a,b){b.children?c+=L(b.children):c++}),c}function M(a,c,d,e){var h,i,j,k,l,f=a,g=!1;if(!e.createSearchChoice||!e.tokenSeparators||e.tokenSeparators.length<1)return b;for(;;){for(i=-1,j=0,k=e.tokenSeparators.length;k>j&&(l=e.tokenSeparators[j],i=a.indexOf(l),!(i>=0));j++);if(0>i)break;if(h=a.substring(0,i),a=a.substring(i+l.length),h.length>0&&(h=e.createSearchChoice.call(this,h,c),h!==b&&null!==h&&e.id(h)!==b&&null!==e.id(h))){for(g=!1,j=0,k=c.length;k>j;j++)if(q(e.id(h),e.id(c[j]))){g=!0;break}g||d(h)}}return f!==a?a:void 0}function N(b,c){var d=function(){};return d.prototype=new b,d.prototype.constructor=d,d.prototype.parent=b.prototype,d.prototype=a.extend(d.prototype,c),d}if(window.Select2===b){var c,d,e,f,g,h,j,k,i={x:0,y:0},c={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){switch(a=a.which?a.which:a){case c.LEFT:case c.RIGHT:case c.UP:case c.DOWN:return!0}return!1},isControl:function(a){var b=a.which;switch(b){case c.SHIFT:case c.CTRL:case c.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){return a=a.which?a.which:a,a>=112&&123>=a}},l="
    ",m={"\u24b6":"A","\uff21":"A","\xc0":"A","\xc1":"A","\xc2":"A","\u1ea6":"A","\u1ea4":"A","\u1eaa":"A","\u1ea8":"A","\xc3":"A","\u0100":"A","\u0102":"A","\u1eb0":"A","\u1eae":"A","\u1eb4":"A","\u1eb2":"A","\u0226":"A","\u01e0":"A","\xc4":"A","\u01de":"A","\u1ea2":"A","\xc5":"A","\u01fa":"A","\u01cd":"A","\u0200":"A","\u0202":"A","\u1ea0":"A","\u1eac":"A","\u1eb6":"A","\u1e00":"A","\u0104":"A","\u023a":"A","\u2c6f":"A","\ua732":"AA","\xc6":"AE","\u01fc":"AE","\u01e2":"AE","\ua734":"AO","\ua736":"AU","\ua738":"AV","\ua73a":"AV","\ua73c":"AY","\u24b7":"B","\uff22":"B","\u1e02":"B","\u1e04":"B","\u1e06":"B","\u0243":"B","\u0182":"B","\u0181":"B","\u24b8":"C","\uff23":"C","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\xc7":"C","\u1e08":"C","\u0187":"C","\u023b":"C","\ua73e":"C","\u24b9":"D","\uff24":"D","\u1e0a":"D","\u010e":"D","\u1e0c":"D","\u1e10":"D","\u1e12":"D","\u1e0e":"D","\u0110":"D","\u018b":"D","\u018a":"D","\u0189":"D","\ua779":"D","\u01f1":"DZ","\u01c4":"DZ","\u01f2":"Dz","\u01c5":"Dz","\u24ba":"E","\uff25":"E","\xc8":"E","\xc9":"E","\xca":"E","\u1ec0":"E","\u1ebe":"E","\u1ec4":"E","\u1ec2":"E","\u1ebc":"E","\u0112":"E","\u1e14":"E","\u1e16":"E","\u0114":"E","\u0116":"E","\xcb":"E","\u1eba":"E","\u011a":"E","\u0204":"E","\u0206":"E","\u1eb8":"E","\u1ec6":"E","\u0228":"E","\u1e1c":"E","\u0118":"E","\u1e18":"E","\u1e1a":"E","\u0190":"E","\u018e":"E","\u24bb":"F","\uff26":"F","\u1e1e":"F","\u0191":"F","\ua77b":"F","\u24bc":"G","\uff27":"G","\u01f4":"G","\u011c":"G","\u1e20":"G","\u011e":"G","\u0120":"G","\u01e6":"G","\u0122":"G","\u01e4":"G","\u0193":"G","\ua7a0":"G","\ua77d":"G","\ua77e":"G","\u24bd":"H","\uff28":"H","\u0124":"H","\u1e22":"H","\u1e26":"H","\u021e":"H","\u1e24":"H","\u1e28":"H","\u1e2a":"H","\u0126":"H","\u2c67":"H","\u2c75":"H","\ua78d":"H","\u24be":"I","\uff29":"I","\xcc":"I","\xcd":"I","\xce":"I","\u0128":"I","\u012a":"I","\u012c":"I","\u0130":"I","\xcf":"I","\u1e2e":"I","\u1ec8":"I","\u01cf":"I","\u0208":"I","\u020a":"I","\u1eca":"I","\u012e":"I","\u1e2c":"I","\u0197":"I","\u24bf":"J","\uff2a":"J","\u0134":"J","\u0248":"J","\u24c0":"K","\uff2b":"K","\u1e30":"K","\u01e8":"K","\u1e32":"K","\u0136":"K","\u1e34":"K","\u0198":"K","\u2c69":"K","\ua740":"K","\ua742":"K","\ua744":"K","\ua7a2":"K","\u24c1":"L","\uff2c":"L","\u013f":"L","\u0139":"L","\u013d":"L","\u1e36":"L","\u1e38":"L","\u013b":"L","\u1e3c":"L","\u1e3a":"L","\u0141":"L","\u023d":"L","\u2c62":"L","\u2c60":"L","\ua748":"L","\ua746":"L","\ua780":"L","\u01c7":"LJ","\u01c8":"Lj","\u24c2":"M","\uff2d":"M","\u1e3e":"M","\u1e40":"M","\u1e42":"M","\u2c6e":"M","\u019c":"M","\u24c3":"N","\uff2e":"N","\u01f8":"N","\u0143":"N","\xd1":"N","\u1e44":"N","\u0147":"N","\u1e46":"N","\u0145":"N","\u1e4a":"N","\u1e48":"N","\u0220":"N","\u019d":"N","\ua790":"N","\ua7a4":"N","\u01ca":"NJ","\u01cb":"Nj","\u24c4":"O","\uff2f":"O","\xd2":"O","\xd3":"O","\xd4":"O","\u1ed2":"O","\u1ed0":"O","\u1ed6":"O","\u1ed4":"O","\xd5":"O","\u1e4c":"O","\u022c":"O","\u1e4e":"O","\u014c":"O","\u1e50":"O","\u1e52":"O","\u014e":"O","\u022e":"O","\u0230":"O","\xd6":"O","\u022a":"O","\u1ece":"O","\u0150":"O","\u01d1":"O","\u020c":"O","\u020e":"O","\u01a0":"O","\u1edc":"O","\u1eda":"O","\u1ee0":"O","\u1ede":"O","\u1ee2":"O","\u1ecc":"O","\u1ed8":"O","\u01ea":"O","\u01ec":"O","\xd8":"O","\u01fe":"O","\u0186":"O","\u019f":"O","\ua74a":"O","\ua74c":"O","\u01a2":"OI","\ua74e":"OO","\u0222":"OU","\u24c5":"P","\uff30":"P","\u1e54":"P","\u1e56":"P","\u01a4":"P","\u2c63":"P","\ua750":"P","\ua752":"P","\ua754":"P","\u24c6":"Q","\uff31":"Q","\ua756":"Q","\ua758":"Q","\u024a":"Q","\u24c7":"R","\uff32":"R","\u0154":"R","\u1e58":"R","\u0158":"R","\u0210":"R","\u0212":"R","\u1e5a":"R","\u1e5c":"R","\u0156":"R","\u1e5e":"R","\u024c":"R","\u2c64":"R","\ua75a":"R","\ua7a6":"R","\ua782":"R","\u24c8":"S","\uff33":"S","\u1e9e":"S","\u015a":"S","\u1e64":"S","\u015c":"S","\u1e60":"S","\u0160":"S","\u1e66":"S","\u1e62":"S","\u1e68":"S","\u0218":"S","\u015e":"S","\u2c7e":"S","\ua7a8":"S","\ua784":"S","\u24c9":"T","\uff34":"T","\u1e6a":"T","\u0164":"T","\u1e6c":"T","\u021a":"T","\u0162":"T","\u1e70":"T","\u1e6e":"T","\u0166":"T","\u01ac":"T","\u01ae":"T","\u023e":"T","\ua786":"T","\ua728":"TZ","\u24ca":"U","\uff35":"U","\xd9":"U","\xda":"U","\xdb":"U","\u0168":"U","\u1e78":"U","\u016a":"U","\u1e7a":"U","\u016c":"U","\xdc":"U","\u01db":"U","\u01d7":"U","\u01d5":"U","\u01d9":"U","\u1ee6":"U","\u016e":"U","\u0170":"U","\u01d3":"U","\u0214":"U","\u0216":"U","\u01af":"U","\u1eea":"U","\u1ee8":"U","\u1eee":"U","\u1eec":"U","\u1ef0":"U","\u1ee4":"U","\u1e72":"U","\u0172":"U","\u1e76":"U","\u1e74":"U","\u0244":"U","\u24cb":"V","\uff36":"V","\u1e7c":"V","\u1e7e":"V","\u01b2":"V","\ua75e":"V","\u0245":"V","\ua760":"VY","\u24cc":"W","\uff37":"W","\u1e80":"W","\u1e82":"W","\u0174":"W","\u1e86":"W","\u1e84":"W","\u1e88":"W","\u2c72":"W","\u24cd":"X","\uff38":"X","\u1e8a":"X","\u1e8c":"X","\u24ce":"Y","\uff39":"Y","\u1ef2":"Y","\xdd":"Y","\u0176":"Y","\u1ef8":"Y","\u0232":"Y","\u1e8e":"Y","\u0178":"Y","\u1ef6":"Y","\u1ef4":"Y","\u01b3":"Y","\u024e":"Y","\u1efe":"Y","\u24cf":"Z","\uff3a":"Z","\u0179":"Z","\u1e90":"Z","\u017b":"Z","\u017d":"Z","\u1e92":"Z","\u1e94":"Z","\u01b5":"Z","\u0224":"Z","\u2c7f":"Z","\u2c6b":"Z","\ua762":"Z","\u24d0":"a","\uff41":"a","\u1e9a":"a","\xe0":"a","\xe1":"a","\xe2":"a","\u1ea7":"a","\u1ea5":"a","\u1eab":"a","\u1ea9":"a","\xe3":"a","\u0101":"a","\u0103":"a","\u1eb1":"a","\u1eaf":"a","\u1eb5":"a","\u1eb3":"a","\u0227":"a","\u01e1":"a","\xe4":"a","\u01df":"a","\u1ea3":"a","\xe5":"a","\u01fb":"a","\u01ce":"a","\u0201":"a","\u0203":"a","\u1ea1":"a","\u1ead":"a","\u1eb7":"a","\u1e01":"a","\u0105":"a","\u2c65":"a","\u0250":"a","\ua733":"aa","\xe6":"ae","\u01fd":"ae","\u01e3":"ae","\ua735":"ao","\ua737":"au","\ua739":"av","\ua73b":"av","\ua73d":"ay","\u24d1":"b","\uff42":"b","\u1e03":"b","\u1e05":"b","\u1e07":"b","\u0180":"b","\u0183":"b","\u0253":"b","\u24d2":"c","\uff43":"c","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\xe7":"c","\u1e09":"c","\u0188":"c","\u023c":"c","\ua73f":"c","\u2184":"c","\u24d3":"d","\uff44":"d","\u1e0b":"d","\u010f":"d","\u1e0d":"d","\u1e11":"d","\u1e13":"d","\u1e0f":"d","\u0111":"d","\u018c":"d","\u0256":"d","\u0257":"d","\ua77a":"d","\u01f3":"dz","\u01c6":"dz","\u24d4":"e","\uff45":"e","\xe8":"e","\xe9":"e","\xea":"e","\u1ec1":"e","\u1ebf":"e","\u1ec5":"e","\u1ec3":"e","\u1ebd":"e","\u0113":"e","\u1e15":"e","\u1e17":"e","\u0115":"e","\u0117":"e","\xeb":"e","\u1ebb":"e","\u011b":"e","\u0205":"e","\u0207":"e","\u1eb9":"e","\u1ec7":"e","\u0229":"e","\u1e1d":"e","\u0119":"e","\u1e19":"e","\u1e1b":"e","\u0247":"e","\u025b":"e","\u01dd":"e","\u24d5":"f","\uff46":"f","\u1e1f":"f","\u0192":"f","\ua77c":"f","\u24d6":"g","\uff47":"g","\u01f5":"g","\u011d":"g","\u1e21":"g","\u011f":"g","\u0121":"g","\u01e7":"g","\u0123":"g","\u01e5":"g","\u0260":"g","\ua7a1":"g","\u1d79":"g","\ua77f":"g","\u24d7":"h","\uff48":"h","\u0125":"h","\u1e23":"h","\u1e27":"h","\u021f":"h","\u1e25":"h","\u1e29":"h","\u1e2b":"h","\u1e96":"h","\u0127":"h","\u2c68":"h","\u2c76":"h","\u0265":"h","\u0195":"hv","\u24d8":"i","\uff49":"i","\xec":"i","\xed":"i","\xee":"i","\u0129":"i","\u012b":"i","\u012d":"i","\xef":"i","\u1e2f":"i","\u1ec9":"i","\u01d0":"i","\u0209":"i","\u020b":"i","\u1ecb":"i","\u012f":"i","\u1e2d":"i","\u0268":"i","\u0131":"i","\u24d9":"j","\uff4a":"j","\u0135":"j","\u01f0":"j","\u0249":"j","\u24da":"k","\uff4b":"k","\u1e31":"k","\u01e9":"k","\u1e33":"k","\u0137":"k","\u1e35":"k","\u0199":"k","\u2c6a":"k","\ua741":"k","\ua743":"k","\ua745":"k","\ua7a3":"k","\u24db":"l","\uff4c":"l","\u0140":"l","\u013a":"l","\u013e":"l","\u1e37":"l","\u1e39":"l","\u013c":"l","\u1e3d":"l","\u1e3b":"l","\u017f":"l","\u0142":"l","\u019a":"l","\u026b":"l","\u2c61":"l","\ua749":"l","\ua781":"l","\ua747":"l","\u01c9":"lj","\u24dc":"m","\uff4d":"m","\u1e3f":"m","\u1e41":"m","\u1e43":"m","\u0271":"m","\u026f":"m","\u24dd":"n","\uff4e":"n","\u01f9":"n","\u0144":"n","\xf1":"n","\u1e45":"n","\u0148":"n","\u1e47":"n","\u0146":"n","\u1e4b":"n","\u1e49":"n","\u019e":"n","\u0272":"n","\u0149":"n","\ua791":"n","\ua7a5":"n","\u01cc":"nj","\u24de":"o","\uff4f":"o","\xf2":"o","\xf3":"o","\xf4":"o","\u1ed3":"o","\u1ed1":"o","\u1ed7":"o","\u1ed5":"o","\xf5":"o","\u1e4d":"o","\u022d":"o","\u1e4f":"o","\u014d":"o","\u1e51":"o","\u1e53":"o","\u014f":"o","\u022f":"o","\u0231":"o","\xf6":"o","\u022b":"o","\u1ecf":"o","\u0151":"o","\u01d2":"o","\u020d":"o","\u020f":"o","\u01a1":"o","\u1edd":"o","\u1edb":"o","\u1ee1":"o","\u1edf":"o","\u1ee3":"o","\u1ecd":"o","\u1ed9":"o","\u01eb":"o","\u01ed":"o","\xf8":"o","\u01ff":"o","\u0254":"o","\ua74b":"o","\ua74d":"o","\u0275":"o","\u01a3":"oi","\u0223":"ou","\ua74f":"oo","\u24df":"p","\uff50":"p","\u1e55":"p","\u1e57":"p","\u01a5":"p","\u1d7d":"p","\ua751":"p","\ua753":"p","\ua755":"p","\u24e0":"q","\uff51":"q","\u024b":"q","\ua757":"q","\ua759":"q","\u24e1":"r","\uff52":"r","\u0155":"r","\u1e59":"r","\u0159":"r","\u0211":"r","\u0213":"r","\u1e5b":"r","\u1e5d":"r","\u0157":"r","\u1e5f":"r","\u024d":"r","\u027d":"r","\ua75b":"r","\ua7a7":"r","\ua783":"r","\u24e2":"s","\uff53":"s","\xdf":"s","\u015b":"s","\u1e65":"s","\u015d":"s","\u1e61":"s","\u0161":"s","\u1e67":"s","\u1e63":"s","\u1e69":"s","\u0219":"s","\u015f":"s","\u023f":"s","\ua7a9":"s","\ua785":"s","\u1e9b":"s","\u24e3":"t","\uff54":"t","\u1e6b":"t","\u1e97":"t","\u0165":"t","\u1e6d":"t","\u021b":"t","\u0163":"t","\u1e71":"t","\u1e6f":"t","\u0167":"t","\u01ad":"t","\u0288":"t","\u2c66":"t","\ua787":"t","\ua729":"tz","\u24e4":"u","\uff55":"u","\xf9":"u","\xfa":"u","\xfb":"u","\u0169":"u","\u1e79":"u","\u016b":"u","\u1e7b":"u","\u016d":"u","\xfc":"u","\u01dc":"u","\u01d8":"u","\u01d6":"u","\u01da":"u","\u1ee7":"u","\u016f":"u","\u0171":"u","\u01d4":"u","\u0215":"u","\u0217":"u","\u01b0":"u","\u1eeb":"u","\u1ee9":"u","\u1eef":"u","\u1eed":"u","\u1ef1":"u","\u1ee5":"u","\u1e73":"u","\u0173":"u","\u1e77":"u","\u1e75":"u","\u0289":"u","\u24e5":"v","\uff56":"v","\u1e7d":"v","\u1e7f":"v","\u028b":"v","\ua75f":"v","\u028c":"v","\ua761":"vy","\u24e6":"w","\uff57":"w","\u1e81":"w","\u1e83":"w","\u0175":"w","\u1e87":"w","\u1e85":"w","\u1e98":"w","\u1e89":"w","\u2c73":"w","\u24e7":"x","\uff58":"x","\u1e8b":"x","\u1e8d":"x","\u24e8":"y","\uff59":"y","\u1ef3":"y","\xfd":"y","\u0177":"y","\u1ef9":"y","\u0233":"y","\u1e8f":"y","\xff":"y","\u1ef7":"y","\u1e99":"y","\u1ef5":"y","\u01b4":"y","\u024f":"y","\u1eff":"y","\u24e9":"z","\uff5a":"z","\u017a":"z","\u1e91":"z","\u017c":"z","\u017e":"z","\u1e93":"z","\u1e95":"z","\u01b6":"z","\u0225":"z","\u0240":"z","\u2c6c":"z","\ua763":"z"};j=a(document),g=function(){var a=1;return function(){return a++}}(),j.on("mousemove",function(a){i.x=a.pageX,i.y=a.pageY}),d=N(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(c){var d,e,h,i,f=".select2-results";this.opts=c=this.prepareOpts(c),this.id=c.id,c.element.data("select2")!==b&&null!==c.element.data("select2")&&c.element.data("select2").destroy(),this.container=this.createContainer(),this.containerId="s2id_"+(c.element.attr("id")||"autogen"+g()),this.containerSelector="#"+this.containerId.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g,"\\$1"),this.container.attr("id",this.containerId),this.body=w(function(){return c.element.closest("body")}),D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.attr("style",c.element.attr("style")),this.container.css(K(c.containerCss)),this.container.addClass(K(c.containerCssClass)),this.elementTabIndex=this.opts.element.attr("tabindex"),this.opts.element.data("select2",this).attr("tabindex","-1").before(this.container),this.container.data("select2",this),this.dropdown=this.container.find(".select2-drop"),this.dropdown.addClass(K(c.dropdownCssClass)),this.dropdown.data("select2",this),D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.results=d=this.container.find(f),this.search=e=this.container.find("input.select2-input"),this.queryCount=0,this.resultsPage=0,this.context=null,this.initContainer(),u(this.results),this.dropdown.on("mousemove-filtered touchstart touchmove touchend",f,this.bind(this.highlightUnderEvent)),x(80,this.results),this.dropdown.on("scroll-debounced",f,this.bind(this.loadMoreIfNeeded)),a(this.container).on("change",".select2-input",function(a){a.stopPropagation()}),a(this.dropdown).on("change",".select2-input",function(a){a.stopPropagation()}),a.fn.mousewheel&&d.mousewheel(function(a,b,c,e){var f=d.scrollTop();e>0&&0>=f-e?(d.scrollTop(0),A(a)):0>e&&d.get(0).scrollHeight-d.scrollTop()+e<=d.height()&&(d.scrollTop(d.get(0).scrollHeight-d.height()),A(a))}),t(e),e.on("keyup-change input paste",this.bind(this.updateResults)),e.on("focus",function(){e.addClass("select2-focused")}),e.on("blur",function(){e.removeClass("select2-focused")}),this.dropdown.on("mouseup",f,this.bind(function(b){a(b.target).closest(".select2-result-selectable").length>0&&(this.highlightUnderEvent(b),this.selectHighlighted(b))})),this.dropdown.on("click mouseup mousedown",function(a){a.stopPropagation()}),a.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource()),null!==c.maximumInputLength&&this.search.attr("maxlength",c.maximumInputLength);var h=c.element.prop("disabled");h===b&&(h=!1),this.enable(!h);var i=c.element.prop("readonly");i===b&&(i=!1),this.readonly(i),k=k||p(),this.autofocus=c.element.prop("autofocus"),c.element.prop("autofocus",!1),this.autofocus&&this.focus(),this.nextSearchTerm=b},destroy:function(){var a=this.opts.element,c=a.data("select2");this.close(),this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),c!==b&&(c.container.remove(),c.dropdown.remove(),a.removeClass("select2-offscreen").removeData("select2").off(".select2").prop("autofocus",this.autofocus||!1),this.elementTabIndex?a.attr({tabindex:this.elementTabIndex}):a.removeAttr("tabindex"),a.show())},optionToData:function(a){return a.is("option")?{id:a.prop("value"),text:a.text(),element:a.get(),css:a.attr("class"),disabled:a.prop("disabled"),locked:q(a.attr("locked"),"locked")||q(a.data("locked"),!0)}:a.is("optgroup")?{text:a.attr("label"),children:[],element:a.get(),css:a.attr("class")}:void 0},prepareOpts:function(c){var d,e,f,g,h=this;if(d=c.element,"select"===d.get(0).tagName.toLowerCase()&&(this.select=e=c.element),e&&a.each(["id","multiple","ajax","query","createSearchChoice","initSelection","data","tags"],function(){if(this in c)throw new Error("Option '"+this+"' is not allowed for Select2 when attached to a element.")}),c=a.extend({},{populateResults:function(d,e,f){var g,l=this.opts.id;g=function(d,e,i){var j,k,m,n,o,p,q,r,s,t;for(d=c.sortResults(d,e,f),j=0,k=d.length;k>j;j+=1)m=d[j],o=m.disabled===!0,n=!o&&l(m)!==b,p=m.children&&m.children.length>0,q=a("
  • "),q.addClass("select2-results-dept-"+i),q.addClass("select2-result"),q.addClass(n?"select2-result-selectable":"select2-result-unselectable"),o&&q.addClass("select2-disabled"),p&&q.addClass("select2-result-with-children"),q.addClass(h.opts.formatResultCssClass(m)),r=a(document.createElement("div")),r.addClass("select2-result-label"),t=c.formatResult(m,r,f,h.opts.escapeMarkup),t!==b&&r.html(t),q.append(r),p&&(s=a("
      "),s.addClass("select2-result-sub"),g(m.children,s,i+1),q.append(s)),q.data("select2-data",m),e.append(q)},g(e,d,0)}},a.fn.select2.defaults,c),"function"!=typeof c.id&&(f=c.id,c.id=function(a){return a[f]}),a.isArray(c.element.data("select2Tags"))){if("tags"in c)throw"tags specified as both an attribute 'data-select2-tags' and in options of Select2 "+c.element.attr("id");c.tags=c.element.data("select2Tags")}if(e?(c.query=this.bind(function(a){var f,g,i,c={results:[],more:!1},e=a.term;i=function(b,c){var d;b.is("option")?a.matcher(e,b.text(),b)&&c.push(h.optionToData(b)):b.is("optgroup")&&(d=h.optionToData(b),b.children().each2(function(a,b){i(b,d.children)}),d.children.length>0&&c.push(d))},f=d.children(),this.getPlaceholder()!==b&&f.length>0&&(g=this.getPlaceholderOption(),g&&(f=f.not(g))),f.each2(function(a,b){i(b,c.results)}),a.callback(c)}),c.id=function(a){return a.id},c.formatResultCssClass=function(a){return a.css}):"query"in c||("ajax"in c?(g=c.element.data("ajax-url"),g&&g.length>0&&(c.ajax.url=g),c.query=G.call(c.element,c.ajax)):"data"in c?c.query=H(c.data):"tags"in c&&(c.query=I(c.tags),c.createSearchChoice===b&&(c.createSearchChoice=function(b){return{id:a.trim(b),text:a.trim(b)}}),c.initSelection===b&&(c.initSelection=function(b,d){var e=[];a(r(b.val(),c.separator)).each(function(){var b=this,d=this,f=c.tags;a.isFunction(f)&&(f=f()),a(f).each(function(){return q(this.id,b)?(d=this.text,!1):void 0}),e.push({id:b,text:d})}),d(e)}))),"function"!=typeof c.query)throw"query function not defined for Select2 "+c.element.attr("id");return c},monitorSource:function(){var c,a=this.opts.element;a.on("change.select2",this.bind(function(){this.opts.element.data("select2-change-triggered")!==!0&&this.initSelection()})),c=this.bind(function(){var d,f=a.prop("disabled");f===b&&(f=!1),this.enable(!f);var d=a.prop("readonly");d===b&&(d=!1),this.readonly(d),D(this.container,this.opts.element,this.opts.adaptContainerCssClass),this.container.addClass(K(this.opts.containerCssClass)),D(this.dropdown,this.opts.element,this.opts.adaptDropdownCssClass),this.dropdown.addClass(K(this.opts.dropdownCssClass))}),a.on("propertychange.select2 DOMAttrModified.select2",c),this.mutationCallback===b&&(this.mutationCallback=function(a){a.forEach(c)}),"undefined"!=typeof WebKitMutationObserver&&(this.propertyObserver&&(delete this.propertyObserver,this.propertyObserver=null),this.propertyObserver=new WebKitMutationObserver(this.mutationCallback),this.propertyObserver.observe(a.get(0),{attributes:!0,subtree:!1}))},triggerSelect:function(b){var c=a.Event("select2-selecting",{val:this.id(b),object:b});return this.opts.element.trigger(c),!c.isDefaultPrevented()},triggerChange:function(b){b=b||{},b=a.extend({},b,{type:"change",val:this.val()}),this.opts.element.data("select2-change-triggered",!0),this.opts.element.trigger(b),this.opts.element.data("select2-change-triggered",!1),this.opts.element.click(),this.opts.blurOnChange&&this.opts.element.blur()},isInterfaceEnabled:function(){return this.enabledInterface===!0},enableInterface:function(){var a=this._enabled&&!this._readonly,b=!a;return a===this.enabledInterface?!1:(this.container.toggleClass("select2-container-disabled",b),this.close(),this.enabledInterface=a,!0)},enable:function(a){a===b&&(a=!0),this._enabled!==a&&(this._enabled=a,this.opts.element.prop("disabled",!a),this.enableInterface())},disable:function(){this.enable(!1)},readonly:function(a){return a===b&&(a=!1),this._readonly===a?!1:(this._readonly=a,this.opts.element.prop("readonly",a),this.enableInterface(),!0)},opened:function(){return this.container.hasClass("select2-dropdown-open")},positionDropdown:function(){var q,r,s,t,b=this.dropdown,c=this.container.offset(),d=this.container.outerHeight(!1),e=this.container.outerWidth(!1),f=b.outerHeight(!1),g=a(window).scrollLeft()+a(window).width(),h=a(window).scrollTop()+a(window).height(),i=c.top+d,j=c.left,l=h>=i+f,m=c.top-f>=this.body().scrollTop(),n=b.outerWidth(!1),o=g>=j+n,p=b.hasClass("select2-drop-above");this.opts.dropdownAutoWidth?(t=a(".select2-results",b)[0],b.addClass("select2-drop-auto-width"),b.css("width",""),n=b.outerWidth(!1)+(t.scrollHeight===t.clientHeight?0:k.width),n>e?e=n:n=e,o=g>=j+n):this.container.removeClass("select2-drop-auto-width"),"static"!==this.body().css("position")&&(q=this.body().offset(),i-=q.top,j-=q.left),p?(r=!0,!m&&l&&(r=!1)):(r=!1,!l&&m&&(r=!0)),o||(j=c.left+e-n),r?(i=c.top-f,this.container.addClass("select2-drop-above"),b.addClass("select2-drop-above")):(this.container.removeClass("select2-drop-above"),b.removeClass("select2-drop-above")),s=a.extend({top:i,left:j,width:e},K(this.opts.dropdownCss)),b.css(s)},shouldOpen:function(){var b;return this.opened()?!1:this._enabled===!1||this._readonly===!0?!1:(b=a.Event("select2-opening"),this.opts.element.trigger(b),!b.isDefaultPrevented())},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above"),this.dropdown.removeClass("select2-drop-above")},open:function(){return this.shouldOpen()?(this.opening(),!0):!1},opening:function(){var f,b=this.containerId,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.addClass("select2-dropdown-open").addClass("select2-container-active"),this.clearDropdownAlignmentPreference(),this.dropdown[0]!==this.body().children().last()[0]&&this.dropdown.detach().appendTo(this.body()),f=a("#select2-drop-mask"),0==f.length&&(f=a(document.createElement("div")),f.attr("id","select2-drop-mask").attr("class","select2-drop-mask"),f.hide(),f.appendTo(this.body()),f.on("mousedown touchstart click",function(b){var d,c=a("#select2-drop");c.length>0&&(d=c.data("select2"),d.opts.selectOnBlur&&d.selectHighlighted({noFocus:!0}),d.close({focus:!1}),b.preventDefault(),b.stopPropagation())})),this.dropdown.prev()[0]!==f[0]&&this.dropdown.before(f),a("#select2-drop").removeAttr("id"),this.dropdown.attr("id","select2-drop"),f.show(),this.positionDropdown(),this.dropdown.show(),this.positionDropdown(),this.dropdown.addClass("select2-drop-active");var h=this;this.container.parents().add(window).each(function(){a(this).on(d+" "+c+" "+e,function(){h.positionDropdown()})})},close:function(){if(this.opened()){var b=this.containerId,c="scroll."+b,d="resize."+b,e="orientationchange."+b;this.container.parents().add(window).each(function(){a(this).off(c).off(d).off(e)}),this.clearDropdownAlignmentPreference(),a("#select2-drop-mask").hide(),this.dropdown.removeAttr("id"),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open"),this.results.empty(),this.clearSearch(),this.search.removeClass("select2-active"),this.opts.element.trigger(a.Event("select2-close"))}},externalSearch:function(a){this.open(),this.search.val(a),this.updateResults(!1)},clearSearch:function(){},getMaximumSelectionSize:function(){return K(this.opts.maximumSelectionSize)},ensureHighlightVisible:function(){var c,d,e,f,g,h,i,b=this.results;if(d=this.highlight(),!(0>d)){if(0==d)return b.scrollTop(0),void 0;c=this.findHighlightableChoices().find(".select2-result-label"),e=a(c[d]),f=e.offset().top+e.outerHeight(!0),d===c.length-1&&(i=b.find("li.select2-more-results"),i.length>0&&(f=i.offset().top+i.outerHeight(!0))),g=b.offset().top+b.outerHeight(!0),f>g&&b.scrollTop(b.scrollTop()+(f-g)),h=e.offset().top-b.offset().top,0>h&&"none"!=e.css("display")&&b.scrollTop(b.scrollTop()+h)}},findHighlightableChoices:function(){return this.results.find(".select2-result-selectable:not(.select2-selected):not(.select2-disabled)")},moveHighlight:function(b){for(var c=this.findHighlightableChoices(),d=this.highlight();d>-1&&d=c.length&&(b=c.length-1),0>b&&(b=0),this.removeHighlight(),d=a(c[b]),d.addClass("select2-highlighted"),this.ensureHighlightVisible(),e=d.data("select2-data"),e&&this.opts.element.trigger({type:"select2-highlight",val:this.id(e),choice:e}),void 0)},removeHighlight:function(){this.results.find(".select2-highlighted").removeClass("select2-highlighted")},countSelectableResults:function(){return this.findHighlightableChoices().length},highlightUnderEvent:function(b){var c=a(b.target).closest(".select2-result-selectable");if(c.length>0&&!c.is(".select2-highlighted")){var d=this.findHighlightableChoices();this.highlight(d.index(c))}else 0==c.length&&this.removeHighlight()},loadMoreIfNeeded:function(){var c,a=this.results,b=a.find("li.select2-more-results"),e=this.resultsPage+1,f=this,g=this.search.val(),h=this.context;0!==b.length&&(c=b.offset().top-a.offset().top-a.height(),c<=this.opts.loadMorePadding&&(b.addClass("select2-active"),this.opts.query({element:this.opts.element,term:g,page:e,context:h,matcher:this.opts.matcher,callback:this.bind(function(c){f.opened()&&(f.opts.populateResults.call(this,a,c.results,{term:g,page:e,context:h}),f.postprocessResults(c,!1,!1),c.more===!0?(b.detach().appendTo(a).text(f.opts.formatLoadMore(e+1)),window.setTimeout(function(){f.loadMoreIfNeeded()},10)):b.remove(),f.positionDropdown(),f.resultsPage=e,f.context=c.context,this.opts.element.trigger({type:"select2-loaded",items:c}))})})))},tokenize:function(){},updateResults:function(c){function m(){d.removeClass("select2-active"),h.positionDropdown()}function n(a){e.html(a),m()}var g,i,l,d=this.search,e=this.results,f=this.opts,h=this,j=d.val(),k=a.data(this.container,"select2-last-term");if((c===!0||!k||!q(j,k))&&(a.data(this.container,"select2-last-term",j),c===!0||this.showSearchInput!==!1&&this.opened())){l=++this.queryCount;var o=this.getMaximumSelectionSize();if(o>=1&&(g=this.data(),a.isArray(g)&&g.length>=o&&J(f.formatSelectionTooBig,"formatSelectionTooBig")))return n("
    • "+f.formatSelectionTooBig(o)+"
      • "),void 0;if(d.val().length"+f.formatInputTooShort(d.val(),f.minimumInputLength)+""):n(""),c&&this.showSearch&&this.showSearch(!0),void 0;if(f.maximumInputLength&&d.val().length>f.maximumInputLength)return J(f.formatInputTooLong,"formatInputTooLong")?n("
    • "+f.formatInputTooLong(d.val(),f.maximumInputLength)+"
      • "):n(""),void 0; f.formatSearching&&0===this.findHighlightableChoices().length&&n("
    • "+f.formatSearching()+"
      • "),d.addClass("select2-active"),this.removeHighlight(),i=this.tokenize(),i!=b&&null!=i&&d.val(i),this.resultsPage=1,f.query({element:f.element,term:d.val(),page:this.resultsPage,context:null,matcher:f.matcher,callback:this.bind(function(g){var i;if(l==this.queryCount){if(!this.opened())return this.search.removeClass("select2-active"),void 0;if(this.context=g.context===b?null:g.context,this.opts.createSearchChoice&&""!==d.val()&&(i=this.opts.createSearchChoice.call(h,d.val(),g.results),i!==b&&null!==i&&h.id(i)!==b&&null!==h.id(i)&&0===a(g.results).filter(function(){return q(h.id(this),h.id(i))}).length&&g.results.unshift(i)),0===g.results.length&&J(f.formatNoMatches,"formatNoMatches"))return n("
    • "+f.formatNoMatches(d.val())+"
      • "),void 0;e.empty(),h.opts.populateResults.call(this,e,g.results,{term:d.val(),page:this.resultsPage,context:null}),g.more===!0&&J(f.formatLoadMore,"formatLoadMore")&&(e.append("
    • "+h.opts.escapeMarkup(f.formatLoadMore(this.resultsPage))+"
      • "),window.setTimeout(function(){h.loadMoreIfNeeded()},10)),this.postprocessResults(g,c),m(),this.opts.element.trigger({type:"select2-loaded",items:g})}})})}},cancel:function(){this.close()},blur:function(){this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),this.close(),this.container.removeClass("select2-container-active"),this.search[0]===document.activeElement&&this.search.blur(),this.clearSearch(),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){y(this.search)},selectHighlighted:function(a){var b=this.highlight(),c=this.results.find(".select2-highlighted"),d=c.closest(".select2-result").data("select2-data");d?(this.highlight(b),this.onSelect(d,a)):a&&a.noFocus&&this.close()},getPlaceholder:function(){var a;return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder||((a=this.getPlaceholderOption())!==b?a.text():b)},getPlaceholderOption:function(){if(this.select){var a=this.select.children().first();if(this.opts.placeholderOption!==b)return"first"===this.opts.placeholderOption&&a||"function"==typeof this.opts.placeholderOption&&this.opts.placeholderOption(this.select);if(""===a.text()&&""===a.val())return a}},initContainerWidth:function(){function c(){var c,d,e,f,g;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){if(c=this.opts.element.attr("style"),c!==b)for(d=c.split(";"),f=0,g=d.length;g>f;f+=1)if(e=d[f].replace(/\s/g,"").match(/[^-]width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i),null!==e&&e.length>=1)return e[1];return"resolve"===this.opts.width?(c=this.opts.element.css("width"),c.indexOf("%")>0?c:0===this.opts.element.outerWidth(!1)?"auto":this.opts.element.outerWidth(!1)+"px"):null}return a.isFunction(this.opts.width)?this.opts.width():this.opts.width}var d=c.call(this);null!==d&&this.container.css("width",d)}}),e=N(d,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container"}).html(["","  "," ","","","
      ","
      "," ","
      ","
        ","
      ","
      "].join(""));return b},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.focusser.prop("disabled",!this.isInterfaceEnabled())},opening:function(){var c,d,e;this.opts.minimumResultsForSearch>=0&&this.showSearch(!0),this.parent.opening.apply(this,arguments),this.showSearchInput!==!1&&this.search.val(this.focusser.val()),this.search.focus(),c=this.search.get(0),c.createTextRange?(d=c.createTextRange(),d.collapse(!1),d.select()):c.setSelectionRange&&(e=this.search.val().length,c.setSelectionRange(e,e)),""===this.search.val()&&this.nextSearchTerm!=b&&(this.search.val(this.nextSearchTerm),this.search.select()),this.focusser.prop("disabled",!0).val(""),this.updateResults(!0),this.opts.element.trigger(a.Event("select2-open"))},close:function(a){this.opened()&&(this.parent.close.apply(this,arguments),a=a||{focus:!0},this.focusser.removeAttr("disabled"),a.focus&&this.focusser.focus())},focus:function(){this.opened()?this.close():(this.focusser.removeAttr("disabled"),this.focusser.focus())},isFocused:function(){return this.container.hasClass("select2-container-active")},cancel:function(){this.parent.cancel.apply(this,arguments),this.focusser.removeAttr("disabled"),this.focusser.focus()},destroy:function(){a("label[for='"+this.focusser.attr("id")+"']").attr("for",this.opts.element.attr("id")),this.parent.destroy.apply(this,arguments)},initContainer:function(){var b,d=this.container,e=this.dropdown;this.opts.minimumResultsForSearch<0?this.showSearch(!1):this.showSearch(!0),this.selection=b=d.find(".select2-choice"),this.focusser=d.find(".select2-focusser"),this.focusser.attr("id","s2id_autogen"+g()),a("label[for='"+this.opts.element.attr("id")+"']").attr("for",this.focusser.attr("id")),this.focusser.attr("tabindex",this.elementTabIndex),this.search.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()){if(a.which===c.PAGE_UP||a.which===c.PAGE_DOWN)return A(a),void 0;switch(a.which){case c.UP:case c.DOWN:return this.moveHighlight(a.which===c.UP?-1:1),A(a),void 0;case c.ENTER:return this.selectHighlighted(),A(a),void 0;case c.TAB:return this.opts.selectOnBlur&&this.selectHighlighted({noFocus:!0}),void 0;case c.ESC:return this.cancel(a),A(a),void 0}}})),this.search.on("blur",this.bind(function(){document.activeElement===this.body().get(0)&&window.setTimeout(this.bind(function(){this.search.focus()}),0)})),this.focusser.on("keydown",this.bind(function(a){if(this.isInterfaceEnabled()&&a.which!==c.TAB&&!c.isControl(a)&&!c.isFunctionKey(a)&&a.which!==c.ESC){if(this.opts.openOnEnter===!1&&a.which===c.ENTER)return A(a),void 0;if(a.which==c.DOWN||a.which==c.UP||a.which==c.ENTER&&this.opts.openOnEnter){if(a.altKey||a.ctrlKey||a.shiftKey||a.metaKey)return;return this.open(),A(a),void 0}return a.which==c.DELETE||a.which==c.BACKSPACE?(this.opts.allowClear&&this.clear(),A(a),void 0):void 0}})),t(this.focusser),this.focusser.on("keyup-change input",this.bind(function(a){if(this.opts.minimumResultsForSearch>=0){if(a.stopPropagation(),this.opened())return;this.open()}})),b.on("mousedown","abbr",this.bind(function(a){this.isInterfaceEnabled()&&(this.clear(),B(a),this.close(),this.selection.focus())})),b.on("mousedown",this.bind(function(b){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.opened()?this.close():this.isInterfaceEnabled()&&this.open(),A(b)})),e.on("mousedown",this.bind(function(){this.search.focus()})),b.on("focus",this.bind(function(a){A(a)})),this.focusser.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})).on("blur",this.bind(function(){this.opened()||(this.container.removeClass("select2-container-active"),this.opts.element.trigger(a.Event("select2-blur")))})),this.search.on("focus",this.bind(function(){this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active")})),this.initContainerWidth(),this.opts.element.addClass("select2-offscreen"),this.setPlaceholder()},clear:function(a){var b=this.selection.data("select2-data");if(b){var c=this.getPlaceholderOption();this.opts.element.val(c?c.val():""),this.selection.find(".select2-chosen").empty(),this.selection.removeData("select2-data"),this.setPlaceholder(),a!==!1&&(this.opts.element.trigger({type:"select2-removed",val:this.id(b),choice:b}),this.triggerChange({removed:b}))}},initSelection:function(){if(this.isPlaceholderOptionSelected())this.updateSelection(null),this.close(),this.setPlaceholder();else{var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.setPlaceholder())})}},isPlaceholderOptionSelected:function(){var a;return this.opts.placeholder?(a=this.getPlaceholderOption())!==b&&a.is(":selected")||""===this.opts.element.val()||this.opts.element.val()===b||null===this.opts.element.val():!1},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=a.find(":selected");b(c.optionToData(d))}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=c.val(),f=null;b.query({matcher:function(a,c,d){var g=q(e,b.id(d));return g&&(f=d),g},callback:a.isFunction(d)?function(){d(f)}:a.noop})}),b},getPlaceholder:function(){return this.select&&this.getPlaceholderOption()===b?b:this.parent.getPlaceholder.apply(this,arguments)},setPlaceholder:function(){var a=this.getPlaceholder();if(this.isPlaceholderOptionSelected()&&a!==b){if(this.select&&this.getPlaceholderOption()===b)return;this.selection.find(".select2-chosen").html(this.opts.escapeMarkup(a)),this.selection.addClass("select2-default"),this.container.removeClass("select2-allowclear")}},postprocessResults:function(a,b,c){var d=0,e=this;if(this.findHighlightableChoices().each2(function(a,b){return q(e.id(b.data("select2-data")),e.opts.element.val())?(d=a,!1):void 0}),c!==!1&&(b===!0&&d>=0?this.highlight(d):this.highlight(0)),b===!0){var g=this.opts.minimumResultsForSearch;g>=0&&this.showSearch(L(a.results)>=g)}},showSearch:function(b){this.showSearchInput!==b&&(this.showSearchInput=b,this.dropdown.find(".select2-search").toggleClass("select2-search-hidden",!b),this.dropdown.find(".select2-search").toggleClass("select2-offscreen",!b),a(this.dropdown,this.container).toggleClass("select2-with-searchbox",b))},onSelect:function(a,b){if(this.triggerSelect(a)){var c=this.opts.element.val(),d=this.data();this.opts.element.val(this.id(a)),this.updateSelection(a),this.opts.element.trigger({type:"select2-selected",val:this.id(a),choice:a}),this.nextSearchTerm=this.opts.nextSearchTerm(a,this.search.val()),this.close(),b&&b.noFocus||this.selection.focus(),q(c,this.id(a))||this.triggerChange({added:a,removed:d})}},updateSelection:function(a){var d,e,c=this.selection.find(".select2-chosen");this.selection.data("select2-data",a),c.empty(),null!==a&&(d=this.opts.formatSelection(a,c,this.opts.escapeMarkup)),d!==b&&c.append(d),e=this.opts.formatSelectionCssClass(a,c),e!==b&&c.addClass(e),this.selection.removeClass("select2-default"),this.opts.allowClear&&this.getPlaceholder()!==b&&this.container.addClass("select2-allowclear")},val:function(){var a,c=!1,d=null,e=this,f=this.data();if(0===arguments.length)return this.opts.element.val();if(a=arguments[0],arguments.length>1&&(c=arguments[1]),this.select)this.select.val(a).find(":selected").each2(function(a,b){return d=e.optionToData(b),!1}),this.updateSelection(d),this.setPlaceholder(),c&&this.triggerChange({added:d,removed:f});else{if(!a&&0!==a)return this.clear(c),void 0;if(this.opts.initSelection===b)throw new Error("cannot call val() if initSelection() is not defined");this.opts.element.val(a),this.opts.initSelection(this.opts.element,function(a){e.opts.element.val(a?e.id(a):""),e.updateSelection(a),e.setPlaceholder(),c&&e.triggerChange({added:a,removed:f})})}},clearSearch:function(){this.search.val(""),this.focusser.val("")},data:function(a){var c,d=!1;return 0===arguments.length?(c=this.selection.data("select2-data"),c==b&&(c=null),c):(arguments.length>1&&(d=arguments[1]),a?(c=this.data(),this.opts.element.val(a?this.id(a):""),this.updateSelection(a),d&&this.triggerChange({added:a,removed:c})):this.clear(d),void 0)}}),f=N(d,{createContainer:function(){var b=a(document.createElement("div")).attr({"class":"select2-container select2-container-multi"}).html(["
        ","
      • "," ","
        • ","
      ","
      ","
        ","
      ","
      "].join(""));return b},prepareOpts:function(){var b=this.parent.prepareOpts.apply(this,arguments),c=this;return"select"===b.element.get(0).tagName.toLowerCase()?b.initSelection=function(a,b){var d=[];a.find(":selected").each2(function(a,b){d.push(c.optionToData(b))}),b(d)}:"data"in b&&(b.initSelection=b.initSelection||function(c,d){var e=r(c.val(),b.separator),f=[];b.query({matcher:function(c,d,g){var h=a.grep(e,function(a){return q(a,b.id(g))}).length;return h&&f.push(g),h},callback:a.isFunction(d)?function(){for(var a=[],c=0;c0||(this.selectChoice(null),this.clearPlaceholder(),this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.open(),this.focusSearch(),b.preventDefault()))})),this.container.on("focus",b,this.bind(function(){this.isInterfaceEnabled()&&(this.container.hasClass("select2-container-active")||this.opts.element.trigger(a.Event("select2-focus")),this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())})),this.initContainerWidth(),this.opts.element.addClass("select2-offscreen"),this.clearSearch()},enableInterface:function(){this.parent.enableInterface.apply(this,arguments)&&this.search.prop("disabled",!this.isInterfaceEnabled())},initSelection:function(){if(""===this.opts.element.val()&&""===this.opts.element.text()&&(this.updateSelection([]),this.close(),this.clearSearch()),this.select||""!==this.opts.element.val()){var c=this;this.opts.initSelection.call(null,this.opts.element,function(a){a!==b&&null!==a&&(c.updateSelection(a),c.close(),c.clearSearch())})}},clearSearch:function(){var a=this.getPlaceholder(),c=this.getMaxSearchWidth();a!==b&&0===this.getVal().length&&this.search.hasClass("select2-focused")===!1?(this.search.val(a).addClass("select2-default"),this.search.width(c>0?c:this.container.css("width"))):this.search.val("").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")&&this.search.val("").removeClass("select2-default")},opening:function(){this.clearPlaceholder(),this.resizeSearch(),this.parent.opening.apply(this,arguments),this.focusSearch(),this.updateResults(!0),this.search.focus(),this.opts.element.trigger(a.Event("select2-open"))},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close(),this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(b){var c=[],d=[],e=this;a(b).each(function(){o(e.id(this),c)<0&&(c.push(e.id(this)),d.push(this))}),b=d,this.selection.find(".select2-search-choice").remove(),a(b).each(function(){e.addSelectedChoice(this)}),e.postprocessResults()},tokenize:function(){var a=this.search.val();a=this.opts.tokenizer.call(this,a,this.data(),this.bind(this.onSelect),this.opts),null!=a&&a!=b&&(this.search.val(a),a.length>0&&this.open())},onSelect:function(a,b){this.triggerSelect(a)&&(this.addSelectedChoice(a),this.opts.element.trigger({type:"selected",val:this.id(a),choice:a}),(this.select||!this.opts.closeOnSelect)&&this.postprocessResults(a,!1,this.opts.closeOnSelect===!0),this.opts.closeOnSelect?(this.close(),this.search.width(10)):this.countSelectableResults()>0?(this.search.width(10),this.resizeSearch(),this.getMaximumSelectionSize()>0&&this.val().length>=this.getMaximumSelectionSize()&&this.updateResults(!0),this.positionDropdown()):(this.close(),this.search.width(10)),this.triggerChange({added:a}),b&&b.noFocus||this.focusSearch())},cancel:function(){this.close(),this.focusSearch()},addSelectedChoice:function(c){var j,k,d=!c.locked,e=a("
      • "),f=a("
      • "),g=d?e:f,h=this.id(c),i=this.getVal();j=this.opts.formatSelection(c,g.find("div"),this.opts.escapeMarkup),j!=b&&g.find("div").replaceWith("
      "+j+"
      "),k=this.opts.formatSelectionCssClass(c,g.find("div")),k!=b&&g.addClass(k),d&&g.find(".select2-search-choice-close").on("mousedown",A).on("click dblclick",this.bind(function(b){this.isInterfaceEnabled()&&(a(b.target).closest(".select2-search-choice").fadeOut("fast",this.bind(function(){this.unselect(a(b.target)),this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus"),this.close(),this.focusSearch()})).dequeue(),A(b))})).on("focus",this.bind(function(){this.isInterfaceEnabled()&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))})),g.data("select2-data",c),g.insertBefore(this.searchContainer),i.push(h),this.setVal(i)},unselect:function(a){var c,d,b=this.getVal();if(a=a.closest(".select2-search-choice"),0===a.length)throw"Invalid argument: "+a+". Must be .select2-search-choice";c=a.data("select2-data"),c&&(d=o(this.id(c),b),d>=0&&(b.splice(d,1),this.setVal(b),this.select&&this.postprocessResults()),a.remove(),this.opts.element.trigger({type:"removed",val:this.id(c),choice:c}),this.triggerChange({removed:c}))},postprocessResults:function(a,b,c){var d=this.getVal(),e=this.results.find(".select2-result"),f=this.results.find(".select2-result-with-children"),g=this;e.each2(function(a,b){var c=g.id(b.data("select2-data"));o(c,d)>=0&&(b.addClass("select2-selected"),b.find(".select2-result-selectable").addClass("select2-selected"))}),f.each2(function(a,b){b.is(".select2-result-selectable")||0!==b.find(".select2-result-selectable:not(.select2-selected)").length||b.addClass("select2-selected")}),-1==this.highlight()&&c!==!1&&g.highlight(0),!this.opts.createSearchChoice&&!e.filter(".select2-result:not(.select2-selected)").length>0&&(!a||a&&!a.more&&0===this.results.find(".select2-no-results").length)&&J(g.opts.formatNoMatches,"formatNoMatches")&&this.results.append("
    • "+g.opts.formatNoMatches(g.search.val())+"
      • ")},getMaxSearchWidth:function(){return this.selection.width()-s(this.search)},resizeSearch:function(){var a,b,c,d,e,f=s(this.search);a=C(this.search)+10,b=this.search.offset().left,c=this.selection.width(),d=this.selection.offset().left,e=c-(b-d)-f,a>e&&(e=c-f),40>e&&(e=c-f),0>=e&&(e=a),this.search.width(e)},getVal:function(){var a;return this.select?(a=this.select.val(),null===a?[]:a):(a=this.opts.element.val(),r(a,this.opts.separator))},setVal:function(b){var c;this.select?this.select.val(b):(c=[],a(b).each(function(){o(this,c)<0&&c.push(this)}),this.opts.element.val(0===c.length?"":c.join(this.opts.separator)))},buildChangeDetails:function(a,b){for(var b=b.slice(0),a=a.slice(0),c=0;c. Attach to instead.");this.search.width(0),this.searchContainer.hide()},onSortEnd:function(){var b=[],c=this;this.searchContainer.show(),this.searchContainer.appendTo(this.searchContainer.parent()),this.resizeSearch(),this.selection.find(".select2-search-choice").each(function(){b.push(c.opts.id(a(this).data("select2-data")))}),this.setVal(b),this.triggerChange()},data:function(b,c){var e,f,d=this;return 0===arguments.length?this.selection.find(".select2-search-choice").map(function(){return a(this).data("select2-data")}).get():(f=this.data(),b||(b=[]),e=a.map(b,function(a){return d.opts.id(a)}),this.setVal(e),this.updateSelection(b),this.clearSearch(),c&&this.triggerChange(this.buildChangeDetails(f,this.data())),void 0)}}),a.fn.select2=function(){var d,g,h,i,j,c=Array.prototype.slice.call(arguments,0),k=["val","destroy","opened","open","close","focus","isFocused","container","dropdown","onSortStart","onSortEnd","enable","disable","readonly","positionDropdown","data","search"],l=["opened","isFocused","container","dropdown"],m=["val","data"],n={search:"externalSearch"};return this.each(function(){if(0===c.length||"object"==typeof c[0])d=0===c.length?{}:a.extend({},c[0]),d.element=a(this),"select"===d.element.get(0).tagName.toLowerCase()?j=d.element.prop("multiple"):(j=d.multiple||!1,"tags"in d&&(d.multiple=j=!0)),g=j?new f:new e,g.init(d);else{if("string"!=typeof c[0])throw"Invalid arguments to select2 plugin: "+c;if(o(c[0],k)<0)throw"Unknown method: "+c[0];if(i=b,g=a(this).data("select2"),g===b)return;if(h=c[0],"container"===h?i=g.container:"dropdown"===h?i=g.dropdown:(n[h]&&(h=n[h]),i=g[h].apply(g,c.slice(1))),o(c[0],l)>=0||o(c[0],m)&&1==c.length)return!1}}),i===b?this:i},a.fn.select2.defaults={width:"copy",loadMorePadding:0,closeOnSelect:!0,openOnEnter:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c,d){var e=[];return E(a.text,c.term,e,d),e.join("")},formatSelection:function(a,c,d){return a?d(a.text):b},sortResults:function(a){return a},formatResultCssClass:function(){return b},formatSelectionCssClass:function(){return b},formatNoMatches:function(){return"No matches found"},formatInputTooShort:function(a,b){var c=b-a.length;return"Please enter "+c+" more character"+(1==c?"":"s")},formatInputTooLong:function(a,b){var c=a.length-b;return"Please delete "+c+" character"+(1==c?"":"s")},formatSelectionTooBig:function(a){return"You can only select "+a+" item"+(1==a?"":"s")},formatLoadMore:function(){return"Loading more results..."},formatSearching:function(){return"Searching..."},minimumResultsForSearch:0,minimumInputLength:0,maximumInputLength:null,maximumSelectionSize:0,id:function(a){return a.id},matcher:function(a,b){return n(""+b).toUpperCase().indexOf(n(""+a).toUpperCase())>=0},separator:",",tokenSeparators:[],tokenizer:M,escapeMarkup:F,blurOnChange:!1,selectOnBlur:!1,adaptContainerCssClass:function(a){return a},adaptDropdownCssClass:function(){return null},nextSearchTerm:function(){return b}},a.fn.select2.ajaxDefaults={transport:a.ajax,params:{type:"GET",cache:!1,dataType:"json"}},window.Select2={query:{ajax:G,local:H,tags:I},util:{debounce:v,markMatch:E,escapeMarkup:F,stripDiacritics:n},"class":{"abstract":d,single:e,multi:f}}}}(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/toolbar.js b/app/assets/javascripts/toolbar.js index 3bdf29b..58c178c 100644 --- a/app/assets/javascripts/toolbar.js +++ b/app/assets/javascripts/toolbar.js @@ -1,112 +1,112 @@ -$(document).ready(function() { - - var toolbar = $('.dmp_toolbar').first(), - form = null; - - $('#toolbar_configure').click(function(e) { - e.preventDefault(); - - if (form) { - form.toggle(); - } else { - $.get('/settings/projects.json') - .done(buildSettingsForm) - .fail(function(data) { - // Handle failure? - }); - } - }); - - // FIXME: it would be simpler just to return the partial from - // Settings::ProjectsController#show, but that would perhaps - // mean responding to a JSON request with HTML. - function buildSettingsForm(data) { - if (!form) - form = $('
      '); - - var table = $('
      ').appendTo(form), - thead = $('').appendTo(table), - tbody = $('').appendTo(table), - tfoot = $('').appendTo(table), - cols = data.all_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") + '

      '); - - // Default name column - table.before(''); - thead.append(''); - tbody.append('') - - for (var i = 0, len = cols.length; i < len; i++) { - var title = cols[i].replace(/^\w|_/g, function(c) { return c === '_' ? ' ' : c.toUpperCase(); }), // FIXME: add titles to response for I18n? - label = $('').appendTo(thead), - container = $('').appendTo(tbody), - input = $('').appendTo(container); - - if (selected.indexOf(cols[i]) > -1) - input.attr('checked', 'checked'); - } - - thead.append(''); - tbody.append('') - - var submit = $('').appendTo(tfoot); - cancel = $('' + I18n.t("helpers.submit.cancel") + '').appendTo(tfoot); - - cancel.click(function(e) { - e.preventDefault(); - form.toggle(); - }); - - toolbar.before(form); - } - - /* - 'My plans' filtering - */ - var no_matches_message = $('' + I18n.t("helpers.project.filter.no_matches") + '').appendTo($('#dmp_table tbody')), - rows = $('#dmp_table tbody tr'), - filter = $('#filter'); - - filter.keyup(function() { - var query = $(this).val(), - len = query.length, - filter_re = new RegExp(query, 'i'), - matched = false; - - if (len < 2) { - rows.show(); - no_matches_message.hide(); - return; - } - - no_matches_message.hide(); - - rows.each(function() { - var row = $(this); - row.text().match(filter_re) ? (matched = true && row.show()) : row.hide(); - }); - - if (!matched) - no_matches_message.show(); - }); - - $('#clear_filter').click(function(e) { - e.preventDefault(); - - filter.val(''); - rows.show(); - no_matches_message.hide(); - }); - - $('#filter_form').submit(function(e) { e.preventDefault() } ); - -}); +$(document).ready(function() { + + var toolbar = $('.dmp_toolbar').first(), + form = null; + + $('#toolbar_configure').click(function(e) { + e.preventDefault(); + + if (form) { + form.toggle(); + } else { + $.get('/settings/projects.json') + .done(buildSettingsForm) + .fail(function(data) { + // Handle failure? + }); + } + }); + + // FIXME: it would be simpler just to return the partial from + // Settings::ProjectsController#show, but that would perhaps + // mean responding to a JSON request with HTML. + function buildSettingsForm(data) { + if (!form) + form = $('
      '); + + var table = $('
      ').appendTo(form), + thead = $('').appendTo(table), + tbody = $('').appendTo(table), + tfoot = $('').appendTo(table), + cols = data.all_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") + '

      '); + + // Default name column + table.before(''); + thead.append(''); + tbody.append('') + + for (var i = 0, len = cols.length; i < len; i++) { + var title = cols[i].replace(/^\w|_/g, function(c) { return c === '_' ? ' ' : c.toUpperCase(); }), // FIXME: add titles to response for I18n? + label = $('').appendTo(thead), + container = $('').appendTo(tbody), + input = $('').appendTo(container); + + if (selected.indexOf(cols[i]) > -1) + input.attr('checked', 'checked'); + } + + thead.append(''); + tbody.append('') + + var submit = $('').appendTo(tfoot); + cancel = $('' + I18n.t("helpers.submit.cancel") + '').appendTo(tfoot); + + cancel.click(function(e) { + e.preventDefault(); + form.toggle(); + }); + + toolbar.before(form); + } + + /* + 'My plans' filtering + */ + var no_matches_message = $('' + I18n.t("helpers.project.filter.no_matches") + '').appendTo($('#dmp_table tbody')), + rows = $('#dmp_table tbody tr'), + filter = $('#filter'); + + filter.keyup(function() { + var query = $(this).val(), + len = query.length, + filter_re = new RegExp(query, 'i'), + matched = false; + + if (len < 2) { + rows.show(); + no_matches_message.hide(); + return; + } + + no_matches_message.hide(); + + rows.each(function() { + var row = $(this); + row.text().match(filter_re) ? (matched = true && row.show()) : row.hide(); + }); + + if (!matched) + no_matches_message.show(); + }); + + $('#clear_filter').click(function(e) { + e.preventDefault(); + + filter.val(''); + rows.show(); + no_matches_message.hide(); + }); + + $('#filter_form').submit(function(e) { e.preventDefault() } ); + +}); diff --git a/app/assets/stylesheets/active_admin.scss b/app/assets/stylesheets/active_admin.scss index d3c61f3..b9759c9 100644 --- a/app/assets/stylesheets/active_admin.scss +++ b/app/assets/stylesheets/active_admin.scss @@ -1,17 +1,17 @@ -// SASS variable overrides must be declared before loading up Active Admin's styles. -// -// To view the variables that Active Admin provides, take a look at -// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the -// Active Admin source. -// -// For example, to change the sidebar width: -// $sidebar-width: 242px; - -// Active Admin's got SASS! -@import "active_admin/mixins"; -@import "active_admin/base"; - -// Overriding any non-variable SASS must be done after the fact. -// For example, to change the default status-tag color: -// -// .status_tag { background: #6090DB; } +// SASS variable overrides must be declared before loading up Active Admin's styles. +// +// To view the variables that Active Admin provides, take a look at +// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the +// Active Admin source. +// +// For example, to change the sidebar width: +// $sidebar-width: 242px; + +// Active Admin's got SASS! +@import "active_admin/mixins"; +@import "active_admin/base"; + +// Overriding any non-variable SASS must be done after the fact. +// For example, to change the default status-tag color: +// +// .status_tag { background: #6090DB; } diff --git a/app/assets/stylesheets/admin.css.less b/app/assets/stylesheets/admin.css.less index 009ffa9..48be624 100644 --- a/app/assets/stylesheets/admin.css.less +++ b/app/assets/stylesheets/admin.css.less @@ -1704,15 +1704,5 @@ width: 140px; float: right; margin-left: 1px; - } - - - - - - + } } - - - - diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index db43a20..f4a3bdf 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,17 +1,17 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - * require jquery.ui.all - *= require_self - *= require bootstrap_and_overrides - *= require bootstrap.css - *= require bootstrap_and_overrides.css.less - *= require select2.css - */ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the top of the + * compiled file, but it's generally better to create a new file per style scope. + * + * 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.css b/app/assets/stylesheets/bootstrap.css index 90f0019..c69a009 100644 --- a/app/assets/stylesheets/bootstrap.css +++ b/app/assets/stylesheets/bootstrap.css @@ -1,11 +1,11 @@ -/*! - * Bootstrap v2.3.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - - +/*! + * Bootstrap v2.3.2 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + + diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index 0aac89f..08617ed 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -175,13 +175,30 @@ margin-right: 0px; } -#main-nav-tabs li.active a, #main-nav-tabs li.active a:active, #main-nav-tabs li a:hover{ - background-color: @orange_colour; - color: @white_colour !important; - font-weight: bold; - border: 1px solid @orange_colour; - padding: 4px 15px 4px 15px; - text-decoration: none !important; +#main-nav-tabs li.active a, #main-nav-tabs li.active a:active, #main-nav-tabs li a:hover, lang-dropdown-link:hover{ + background-color: @orange_colour; + color: @white_colour !important; + font-weight: bold; + border: 1px solid @orange_colour; + padding: 4px 15px 4px 15px; + text-decoration: none !important; +} + +.caret-orange { + border-top: 4px solid #f49700!important; + border-bottom-color: #f49700!important; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + color: #f49700; +} + +a.dropdown-toggle:hover .caret-orange { + border-top: 4px solid white!important; + border-bottom-color: white!important; +} + +.lang-dropdown-link { + margin-bottom: 0!important; } /********************/ @@ -704,11 +721,15 @@ float:left; } -#s2id_user_organisation_id{ +#s2id_user_organisation_id, #s2id_user_language_id{ min-width:84% !important; clear:both; float:left; - margin: 0 0 10px 0; + margin: 0 0 5px 0; +} + +#s2id__organisation_language_id { + float:none; } #other-org-link { diff --git a/app/assets/stylesheets/httpd.conf b/app/assets/stylesheets/httpd.conf index fea94bc..f473b97 100644 --- a/app/assets/stylesheets/httpd.conf +++ b/app/assets/stylesheets/httpd.conf @@ -1,1037 +1,1037 @@ -# -# This is the main Apache server configuration file. It contains the -# configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# -# for a discussion of each configuration directive. -# -# -# Do NOT simply read the instructions in here without understanding -# what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. -# -# The configuration directives are grouped into three basic sections: -# 1. Directives that control the operation of the Apache server process as a -# whole (the 'global environment'). -# 2. Directives that define the parameters of the 'main' or 'default' server, -# which responds to requests that aren't handled by a virtual host. -# These directives also provide default values for the settings -# of all virtual hosts. -# 3. Settings for virtual hosts, which allow Web requests to be sent to -# different IP addresses or hostnames and have them handled by the -# same Apache server process. -# -# Configuration and logfile names: If the filenames you specify for many -# of the server's control files begin with "/" (or "drive:/" for Win32), the -# server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "/etc/httpd" will be interpreted by the -# server as "/etc/httpd/logs/foo.log". -# - -### Section 1: Global Environment -# -# The directives in this section affect the overall operation of Apache, -# such as the number of concurrent requests it can handle or where it -# can find its configuration files. -# - -# -# Don't give away too much information about all the subcomponents -# we are running. Comment out this line if you don't mind remote sites -# finding out what major optional modules you are running -ServerTokens OS - -# -# ServerRoot: The top of the directory tree under which the server's -# configuration, error, and log files are kept. -# -# NOTE! If you intend to place this on an NFS (or otherwise network) -# mounted filesystem then please read the LockFile documentation -# (available at ); -# you will save yourself a lot of trouble. -# -# Do NOT add a slash at the end of the directory path. -# -ServerRoot "/etc/httpd" - -# -# PidFile: The file in which the server should record its process -# identification number when it starts. Note the PIDFILE variable in -# /etc/sysconfig/httpd must be set appropriately if this location is -# changed. -# -PidFile run/httpd.pid - -# -# Timeout: The number of seconds before receives and sends time out. -# -Timeout 60 - -# -# KeepAlive: Whether or not to allow persistent connections (more than -# one request per connection). Set to "Off" to deactivate. -# -KeepAlive Off - -# -# MaxKeepAliveRequests: The maximum number of requests to allow -# during a persistent connection. Set to 0 to allow an unlimited amount. -# We recommend you leave this number high, for maximum performance. -# -MaxKeepAliveRequests 100 - -# -# KeepAliveTimeout: Number of seconds to wait for the next request from the -# same client on the same connection. -# -KeepAliveTimeout 15 - -## -## Server-Pool Size Regulation (MPM specific) -## - -# prefork MPM -# StartServers: number of server processes to start -# MinSpareServers: minimum number of server processes which are kept spare -# MaxSpareServers: maximum number of server processes which are kept spare -# ServerLimit: maximum value for MaxClients for the lifetime of the server -# MaxClients: maximum number of server processes allowed to start -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 8 -MinSpareServers 5 -MaxSpareServers 20 -ServerLimit 256 -MaxClients 256 -MaxRequestsPerChild 4000 - - -# worker MPM -# StartServers: initial number of server processes to start -# MaxClients: maximum number of simultaneous client connections -# MinSpareThreads: minimum number of worker threads which are kept spare -# MaxSpareThreads: maximum number of worker threads which are kept spare -# ThreadsPerChild: constant number of worker threads in each server process -# MaxRequestsPerChild: maximum number of requests a server process serves - -StartServers 4 -MaxClients 300 -MinSpareThreads 25 -MaxSpareThreads 75 -ThreadsPerChild 25 -MaxRequestsPerChild 0 - - -# -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, in addition to the default. See also the -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) -# -#Listen 12.34.56.78:80 -Listen 80 - -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# have to place corresponding `LoadModule' lines at this location so the -# directives contained in it are actually available _before_ they are used. -# Statically compiled modules (those listed by `httpd -l') do not need -# to be loaded here. -# -# Example: -# LoadModule foo_module modules/mod_foo.so -# -LoadModule auth_basic_module modules/mod_auth_basic.so -LoadModule auth_digest_module modules/mod_auth_digest.so -LoadModule authn_file_module modules/mod_authn_file.so -LoadModule authn_alias_module modules/mod_authn_alias.so -LoadModule authn_anon_module modules/mod_authn_anon.so -LoadModule authn_dbm_module modules/mod_authn_dbm.so -LoadModule authn_default_module modules/mod_authn_default.so -LoadModule authz_host_module modules/mod_authz_host.so -LoadModule authz_user_module modules/mod_authz_user.so -LoadModule authz_owner_module modules/mod_authz_owner.so -LoadModule authz_groupfile_module modules/mod_authz_groupfile.so -LoadModule authz_dbm_module modules/mod_authz_dbm.so -LoadModule authz_default_module modules/mod_authz_default.so -LoadModule ldap_module modules/mod_ldap.so -LoadModule authnz_ldap_module modules/mod_authnz_ldap.so -LoadModule include_module modules/mod_include.so -LoadModule log_config_module modules/mod_log_config.so -LoadModule logio_module modules/mod_logio.so -LoadModule env_module modules/mod_env.so -LoadModule ext_filter_module modules/mod_ext_filter.so -LoadModule mime_magic_module modules/mod_mime_magic.so -LoadModule expires_module modules/mod_expires.so -LoadModule deflate_module modules/mod_deflate.so -LoadModule headers_module modules/mod_headers.so -LoadModule usertrack_module modules/mod_usertrack.so -LoadModule setenvif_module modules/mod_setenvif.so -LoadModule mime_module modules/mod_mime.so -LoadModule dav_module modules/mod_dav.so -LoadModule status_module modules/mod_status.so -LoadModule autoindex_module modules/mod_autoindex.so -LoadModule info_module modules/mod_info.so -LoadModule dav_fs_module modules/mod_dav_fs.so -LoadModule vhost_alias_module modules/mod_vhost_alias.so -LoadModule negotiation_module modules/mod_negotiation.so -LoadModule dir_module modules/mod_dir.so -LoadModule actions_module modules/mod_actions.so -LoadModule speling_module modules/mod_speling.so -LoadModule userdir_module modules/mod_userdir.so -LoadModule alias_module modules/mod_alias.so -LoadModule substitute_module modules/mod_substitute.so -LoadModule rewrite_module modules/mod_rewrite.so -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_balancer_module modules/mod_proxy_balancer.so -LoadModule proxy_ftp_module modules/mod_proxy_ftp.so -LoadModule proxy_http_module modules/mod_proxy_http.so -LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -LoadModule proxy_connect_module modules/mod_proxy_connect.so -LoadModule cache_module modules/mod_cache.so -LoadModule suexec_module modules/mod_suexec.so -LoadModule disk_cache_module modules/mod_disk_cache.so -LoadModule cgi_module modules/mod_cgi.so -LoadModule version_module modules/mod_version.so - -# Ruby on Rails Passenger mod_rails - LoadModule passenger_module /home/dmpdev/.rvm/gems/ruby-2.0.0-p247/gems/passenger-4.0.10/buildout/apache2/mod_passenger.so - PassengerRoot /home/dmpdev/.rvm/gems/ruby-2.0.0-p247/gems/passenger-4.0.10 - PassengerDefaultRuby /home/dmpdev/.rvm/wrappers/ruby-2.0.0-p247/ruby - -# -# The following modules are not loaded by default: -# -#LoadModule asis_module modules/mod_asis.so -#LoadModule authn_dbd_module modules/mod_authn_dbd.so -#LoadModule cern_meta_module modules/mod_cern_meta.so -#LoadModule cgid_module modules/mod_cgid.so -#LoadModule dbd_module modules/mod_dbd.so -#LoadModule dumpio_module modules/mod_dumpio.so -#LoadModule filter_module modules/mod_filter.so -#LoadModule ident_module modules/mod_ident.so -#LoadModule log_forensic_module modules/mod_log_forensic.so -#LoadModule unique_id_module modules/mod_unique_id.so -# - -# -# Load config files from the config directory "/etc/httpd/conf.d". -# -Include conf.d/*.conf - -# -# ExtendedStatus controls whether Apache will generate "full" status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the "server-status" handler is called. The default is Off. -# -#ExtendedStatus On - -# -# If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. -# -# User/Group: The name (or #number) of the user/group to run httpd as. -# . On SCO (ODT 3) use "User nouser" and "Group nogroup". -# . On HPUX you may not be able to use shared memory as nobody, and the -# suggested workaround is to create a user www and use that user. -# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) -# when the value of (unsigned)Group is above 60000; -# don't use Group #-1 on these systems! -# -User apache -Group apache - -### Section 2: 'Main' server configuration -# -# The directives in this section set up the values used by the 'main' -# server, which responds to any requests that aren't handled by a -# definition. These values also provide defaults for -# any containers you may define later in the file. -# -# All of these directives may appear inside containers, -# in which case these default settings will be overridden for the -# virtual host being defined. -# - -# -# ServerAdmin: Your address, where problems with the server should be -# e-mailed. This address appears on some server-generated pages, such -# as error documents. e.g. admin@your-domain.com -# -ServerAdmin root@localhost - -# -# ServerName gives the name and port that the server uses to identify itself. -# This can often be determined automatically, but we recommend you specify -# it explicitly to prevent problems during startup. -# -# If this is not set to valid DNS name for your host, server-generated -# redirections will not work. See also the UseCanonicalName directive. -# -# If your host doesn't have a registered DNS name, enter its IP address here. -# You will have to access it by its address anyway, and this will make -# redirections work in a sensible way. -# -#ServerName www.example.com:80 - -# -# UseCanonicalName: Determines how Apache constructs self-referencing -# URLs and the SERVER_NAME and SERVER_PORT variables. -# When set "Off", Apache will use the Hostname and Port supplied -# by the client. When set "On", Apache will use the value of the -# ServerName directive. -# -UseCanonicalName Off - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "/var/www/html" - -# -# Each directory to which Apache has access can be configured with respect -# to which services and features are allowed and/or disabled in that -# directory (and its subdirectories). -# -# First, we configure the "default" to be a very restrictive set of -# features. -# - - Options FollowSymLinks - AllowOverride None - - -# -# Note that from this point forward you must specifically allow -# particular features to be enabled - so if something's not working as -# you might expect, make sure that you have specifically enabled it -# below. -# - -# -# This should be changed to whatever you set DocumentRoot to. -# - - -# -# Possible values for the Options directive are "None", "All", -# or any combination of: -# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews -# -# Note that "MultiViews" must be named *explicitly* --- "Options All" -# doesn't give it to you. -# -# The Options directive is both complicated and important. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#options -# for more information. -# - Options Indexes FollowSymLinks - -# -# AllowOverride controls what directives may be placed in .htaccess files. -# It can be "All", "None", or any combination of the keywords: -# Options FileInfo AuthConfig Limit -# - AllowOverride None - -# -# Controls who can get stuff from this server. -# - Order allow,deny - Allow from all - - - -# -# UserDir: The name of the directory that is appended onto a user's home -# directory if a ~user request is received. -# -# The path to the end user account 'public_html' directory must be -# accessible to the webserver userid. This usually means that ~userid -# must have permissions of 711, ~userid/public_html must have permissions -# of 755, and documents contained therein must be world-readable. -# Otherwise, the client will only receive a "403 Forbidden" message. -# -# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden -# - - # - # UserDir is disabled by default since it can confirm the presence - # of a username on the system (depending on home directory - # permissions). - # - UserDir disabled - - # - # To enable requests to /~user/ to serve the user's public_html - # directory, remove the "UserDir disabled" line above, and uncomment - # the following line instead: - # - #UserDir public_html - - - -# -# Control access to UserDir directories. The following is an example -# for a site where these directories are restricted to read-only. -# -# -# AllowOverride FileInfo AuthConfig Limit -# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec -# -# Order allow,deny -# Allow from all -# -# -# Order deny,allow -# Deny from all -# -# - -# -# DirectoryIndex: sets the file that Apache will serve if a directory -# is requested. -# -# The index.html.var file (a type-map) is used to deliver content- -# negotiated documents. The MultiViews Option can be used for the -# same purpose, but it is much slower. -# -DirectoryIndex index.html index.html.var - -# -# AccessFileName: The name of the file to look for in each directory -# for additional configuration directives. See also the AllowOverride -# directive. -# -AccessFileName .htaccess - -# -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. -# - - Order allow,deny - Deny from all - Satisfy All - - -# -# TypesConfig describes where the mime.types file (or equivalent) is -# to be found. -# -TypesConfig /etc/mime.types - -# -# DefaultType is the default MIME type the server will use for a document -# if it cannot otherwise determine one, such as from filename extensions. -# If your server contains mostly text or HTML documents, "text/plain" is -# a good value. If most of your content is binary, such as applications -# or images, you may want to use "application/octet-stream" instead to -# keep browsers from trying to display binary files as though they are -# text. -# -DefaultType text/plain - -# -# The mod_mime_magic module allows the server to use various hints from the -# contents of the file itself to determine its type. The MIMEMagicFile -# directive tells the module where the hint definitions are located. -# - -# MIMEMagicFile /usr/share/magic.mime - MIMEMagicFile conf/magic - - -# -# HostnameLookups: Log the names of clients or just their IP addresses -# e.g., www.apache.org (on) or 204.62.129.132 (off). -# The default is off because it'd be overall better for the net if people -# had to knowingly turn this feature on, since enabling it means that -# each client request will result in AT LEAST one lookup request to the -# nameserver. -# -HostnameLookups Off - -# -# EnableMMAP: Control whether memory-mapping is used to deliver -# files (assuming that the underlying OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. On some systems, turning it off (regardless of -# filesystem) can improve performance; for details, please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap -# -#EnableMMAP off - -# -# EnableSendfile: Control whether the sendfile kernel support is -# used to deliver files (assuming that the OS supports it). -# The default is on; turn this off if you serve from NFS-mounted -# filesystems. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile -# -#EnableSendfile off - -# -# ErrorLog: The location of the error log file. -# If you do not specify an ErrorLog directive within a -# container, error messages relating to that virtual host will be -# logged here. If you *do* define an error logfile for a -# container, that host's errors will be logged there and not here. -# -ErrorLog logs/error_log - -# -# LogLevel: Control the number of messages logged to the error_log. -# Possible values include: debug, info, notice, warn, error, crit, -# alert, emerg. -# -LogLevel warn - -# -# The following directives define some format nicknames for use with -# a CustomLog directive (see below). -# -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this -# requires the mod_logio module to be loaded. -#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio - -# -# The location and format of the access logfile (Common Logfile Format). -# If you do not define any access logfiles within a -# container, they will be logged here. Contrariwise, if you *do* -# define per- access logfiles, transactions will be -# logged therein and *not* in this file. -# -#CustomLog logs/access_log common - -# -# If you would like to have separate agent and referer logfiles, uncomment -# the following directives. -# -#CustomLog logs/referer_log referer -#CustomLog logs/agent_log agent - -# -# For a single logfile with access, agent, and referer information -# (Combined Logfile Format), use the following directive: -# -CustomLog logs/access_log combined - -# -# Optionally add a line containing the server version and virtual host -# name to server-generated pages (internal error documents, FTP directory -# listings, mod_status and mod_info output etc., but not CGI generated -# documents or custom error documents). -# Set to "EMail" to also include a mailto: link to the ServerAdmin. -# Set to one of: On | Off | EMail -# -ServerSignature On - -# -# Aliases: Add here as many aliases as you need (with no limit). The format is -# Alias fakename realname -# -# Note that if you include a trailing / on fakename then the server will -# require it to be present in the URL. So "/icons" isn't aliased in this -# example, only "/icons/". If the fakename is slash-terminated, then the -# realname must also be slash terminated, and if the fakename omits the -# trailing slash, the realname must also omit it. -# -# We include the /icons/ alias for FancyIndexed directory listings. If you -# do not use FancyIndexing, you may comment this out. -# -Alias /icons/ "/var/www/icons/" - - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - Allow from all - - -# -# WebDAV module configuration section. -# - - # Location of the WebDAV lock database. - DAVLockDB /var/lib/dav/lockdb - - -# -# ScriptAlias: This controls which directories contain server scripts. -# ScriptAliases are essentially the same as Aliases, except that -# documents in the realname directory are treated as applications and -# run by the server when requested rather than as documents sent to the client. -# The same rules about trailing "/" apply to ScriptAlias directives as to -# Alias. -# -ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" - -# -# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased -# CGI directory exists, if you have that configured. -# - - AllowOverride None - Options None - Order allow,deny - Allow from all - - -# -# Redirect allows you to tell clients about documents which used to exist in -# your server's namespace, but do not anymore. This allows you to tell the -# clients where to look for the relocated document. -# Example: -# Redirect permanent /foo http://www.example.com/bar - -# -# Directives controlling the display of server-generated directory listings. -# - -# -# IndexOptions: Controls the appearance of server-generated directory -# listings. -# -IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8 - -# -# AddIcon* directives tell the server which icon to show for different -# files or filename extensions. These are only displayed for -# FancyIndexed directories. -# -AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip - -AddIconByType (TXT,/icons/text.gif) text/* -AddIconByType (IMG,/icons/image2.gif) image/* -AddIconByType (SND,/icons/sound2.gif) audio/* -AddIconByType (VID,/icons/movie.gif) video/* - -AddIcon /icons/binary.gif .bin .exe -AddIcon /icons/binhex.gif .hqx -AddIcon /icons/tar.gif .tar -AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv -AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip -AddIcon /icons/a.gif .ps .ai .eps -AddIcon /icons/layout.gif .html .shtml .htm .pdf -AddIcon /icons/text.gif .txt -AddIcon /icons/c.gif .c -AddIcon /icons/p.gif .pl .py -AddIcon /icons/f.gif .for -AddIcon /icons/dvi.gif .dvi -AddIcon /icons/uuencoded.gif .uu -AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl -AddIcon /icons/tex.gif .tex -AddIcon /icons/bomb.gif core - -AddIcon /icons/back.gif .. -AddIcon /icons/hand.right.gif README -AddIcon /icons/folder.gif ^^DIRECTORY^^ -AddIcon /icons/blank.gif ^^BLANKICON^^ - -# -# DefaultIcon is which icon to show for files which do not have an icon -# explicitly set. -# -DefaultIcon /icons/unknown.gif - -# -# AddDescription allows you to place a short description after a file in -# server-generated indexes. These are only displayed for FancyIndexed -# directories. -# Format: AddDescription "description" filename -# -#AddDescription "GZIP compressed document" .gz -#AddDescription "tar archive" .tar -#AddDescription "GZIP compressed tar archive" .tgz - -# -# ReadmeName is the name of the README file the server will look for by -# default, and append to directory listings. -# -# HeaderName is the name of a file which should be prepended to -# directory indexes. -ReadmeName README.html -HeaderName HEADER.html - -# -# IndexIgnore is a set of filenames which directory indexing should ignore -# and not include in the listing. Shell-style wildcarding is permitted. -# -IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t - -# -# DefaultLanguage and AddLanguage allows you to specify the language of -# a document. You can then use content negotiation to give a browser a -# file in a language the user can understand. -# -# Specify a default language. This means that all data -# going out without a specific language tag (see below) will -# be marked with this one. You probably do NOT want to set -# this unless you are sure it is correct for all cases. -# -# * It is generally better to not mark a page as -# * being a certain language than marking it with the wrong -# * language! -# -# DefaultLanguage nl -# -# Note 1: The suffix does not have to be the same as the language -# keyword --- those with documents in Polish (whose net-standard -# language code is pl) may wish to use "AddLanguage pl .po" to -# avoid the ambiguity with the common suffix for perl scripts. -# -# Note 2: The example entries below illustrate that in some cases -# the two character 'Language' abbreviation is not identical to -# the two character 'Country' code for its country, -# E.g. 'Danmark/dk' versus 'Danish/da'. -# -# Note 3: In the case of 'ltz' we violate the RFC by using a three char -# specifier. There is 'work in progress' to fix this and get -# the reference data for rfc1766 cleaned up. -# -# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) -# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) -# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) -# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) -# Norwegian (no) - Polish (pl) - Portugese (pt) -# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) -# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) -# -AddLanguage ca .ca -AddLanguage cs .cz .cs -AddLanguage da .dk -AddLanguage de .de -AddLanguage el .el -AddLanguage en .en -AddLanguage eo .eo -AddLanguage es .es -AddLanguage et .et -AddLanguage fr .fr -AddLanguage he .he -AddLanguage hr .hr -AddLanguage it .it -AddLanguage ja .ja -AddLanguage ko .ko -AddLanguage ltz .ltz -AddLanguage nl .nl -AddLanguage nn .nn -AddLanguage no .no -AddLanguage pl .po -AddLanguage pt .pt -AddLanguage pt-BR .pt-br -AddLanguage ru .ru -AddLanguage sv .sv -AddLanguage zh-CN .zh-cn -AddLanguage zh-TW .zh-tw - -# -# LanguagePriority allows you to give precedence to some languages -# in case of a tie during content negotiation. -# -# Just list the languages in decreasing order of preference. We have -# more or less alphabetized them here. You probably want to change this. -# -LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW - -# -# ForceLanguagePriority allows you to serve a result page rather than -# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) -# [in case no accepted languages matched the available variants] -# -ForceLanguagePriority Prefer Fallback - -# -# Specify a default charset for all content served; this enables -# interpretation of all content as UTF-8 by default. To use the -# default browser choice (ISO-8859-1), or to allow the META tags -# in HTML content to override this choice, comment out this -# directive: -# -AddDefaultCharset UTF-8 - -# -# AddType allows you to add to or override the MIME configuration -# file mime.types for specific file types. -# -#AddType application/x-tar .tgz - -# -# AddEncoding allows you to have certain browsers uncompress -# information on the fly. Note: Not all browsers support this. -# Despite the name similarity, the following Add* directives have nothing -# to do with the FancyIndexing customization directives above. -# -#AddEncoding x-compress .Z -#AddEncoding x-gzip .gz .tgz - -# If the AddEncoding directives above are commented-out, then you -# probably should define those extensions to indicate media types: -# -AddType application/x-compress .Z -AddType application/x-gzip .gz .tgz - -# -# MIME-types for downloading Certificates and CRLs -# -AddType application/x-x509-ca-cert .crt -AddType application/x-pkcs7-crl .crl - -# -# AddHandler allows you to map certain file extensions to "handlers": -# actions unrelated to filetype. These can be either built into the server -# or added with the Action directive (see below) -# -# To use CGI scripts outside of ScriptAliased directories: -# (You will also need to add "ExecCGI" to the "Options" directive.) -# -#AddHandler cgi-script .cgi - -# -# For files that include their own HTTP headers: -# -#AddHandler send-as-is asis - -# -# For type maps (negotiated resources): -# (This is enabled by default to allow the Apache "It Worked" page -# to be distributed in multiple languages.) -# -AddHandler type-map var - -# -# Filters allow you to process content before it is sent to the client. -# -# To parse .shtml files for server-side includes (SSI): -# (You will also need to add "Includes" to the "Options" directive.) -# -AddType text/html .shtml -AddOutputFilter INCLUDES .shtml - -# -# Action lets you define media types that will execute a script whenever -# a matching file is called. This eliminates the need for repeated URL -# pathnames for oft-used CGI file processors. -# Format: Action media/type /cgi-script/location -# Format: Action handler-name /cgi-script/location -# - -# -# Customizable error responses come in three flavors: -# 1) plain text 2) local redirects 3) external redirects -# -# Some examples: -#ErrorDocument 500 "The server made a boo boo." -#ErrorDocument 404 /missing.html -#ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://www.example.com/subscription_info.html -# - -# -# Putting this all together, we can internationalize error responses. -# -# We use Alias to redirect any /error/HTTP_.html.var response to -# our collection of by-error message multi-language collections. We use -# includes to substitute the appropriate text. -# -# You can modify the messages' appearance without changing any of the -# default HTTP_.html.var files by adding the line: -# -# Alias /error/include/ "/your/include/path/" -# -# which allows you to create your own set of files by starting with the -# /var/www/error/include/ files and -# copying them to /your/include/path/, even on a per-VirtualHost basis. -# - -Alias /error/ "/var/www/error/" - - - - - AllowOverride None - Options IncludesNoExec - AddOutputFilter Includes html - AddHandler type-map var - Order allow,deny - Allow from all - LanguagePriority en es de fr - ForceLanguagePriority Prefer Fallback - - -# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var -# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var -# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var -# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var -# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var -# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var -# ErrorDocument 410 /error/HTTP_GONE.html.var -# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var -# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var -# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var -# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var -# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var -# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var -# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var -# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var -# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var -# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var - - - - -# -# The following directives modify normal HTTP response behavior to -# handle known problems with browser implementations. -# -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4\.0" force-response-1.0 -BrowserMatch "Java/1\.0" force-response-1.0 -BrowserMatch "JDK/1\.0" force-response-1.0 - -# -# The following directive disables redirects on non-GET requests for -# a directory that does not include the trailing slash. This fixes a -# problem with Microsoft WebFolders which does not appropriately handle -# redirects for folders with DAV methods. -# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. -# -BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully -BrowserMatch "MS FrontPage" redirect-carefully -BrowserMatch "^WebDrive" redirect-carefully -BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully -BrowserMatch "^gnome-vfs/1.0" redirect-carefully -BrowserMatch "^XML Spy" redirect-carefully -BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully - -# -# Allow server status reports generated by mod_status, -# with the URL of http://servername/server-status -# Change the ".example.com" to match your domain to enable. -# -# -# SetHandler server-status -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Allow remote server configuration reports, with the URL of -# http://servername/server-info (requires that mod_info.c be loaded). -# Change the ".example.com" to match your domain to enable. -# -# -# SetHandler server-info -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Proxy Server directives. Uncomment the following lines to -# enable the proxy server: -# -# -#ProxyRequests On -# -# -# Order deny,allow -# Deny from all -# Allow from .example.com -# - -# -# Enable/disable the handling of HTTP/1.1 "Via:" headers. -# ("Full" adds the server version; "Block" removes all outgoing Via: headers) -# Set to one of: Off | On | Full | Block -# -#ProxyVia On - -# -# To enable a cache of proxied content, uncomment the following lines. -# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details. -# -# -# CacheEnable disk / -# CacheRoot "/var/cache/mod_proxy" -# -# - -# -# End of proxy directives. - -### Section 3: Virtual Hosts -# -# VirtualHost: If you want to maintain multiple domains/hostnames on your -# machine you can setup VirtualHost containers for them. Most configurations -# use only name-based virtual hosts so the server doesn't need to worry about -# IP addresses. This is indicated by the asterisks in the directives below. -# -# Please see the documentation at -# -# for further details before you try to setup virtual hosts. -# -# You may use the command line option '-S' to verify your virtual host -# configuration. - -# -# Use name-based virtual hosting. -# -#NameVirtualHost *:80 -# -# NOTE: NameVirtualHost cannot be used without a port specifier -# (e.g. :80) if mod_ssl is being used, due to the nature of the -# SSL protocol. -# - -# -# VirtualHost example: -# Almost any Apache directive may go into a VirtualHost container. -# The first VirtualHost section is used for requests without a known -# server name. -# -# -# ServerAdmin webmaster@dummy-host.example.com -# DocumentRoot /www/docs/dummy-host.example.com -# ServerName dummy-host.example.com -# ErrorLog logs/dummy-host.example.com-error_log -# CustomLog logs/dummy-host.example.com-access_log common -# - -#NameVirtualHost *:80 -# - - ServerName dmponline-test.dcc.ac.uk - # !!! Be sure to point DocumentRoot to 'public'! - DocumentRoot /var/www/html/dmponline_v4/public - Alias /maintenance/ "/var/www/html/maintenance/" - ErrorDocument 403 /maintenance/403.html - - Order Deny,Allow - # Always open to allow serving of 403 error page - Deny from none - Allow from all - - - Options -MultiViews - RewriteEngine On - RewriteRule ^/?(.*)$ https://dmponline-test.dcc.ac.uk/$1 [QSA,R=permanent] # This relaxes Apache security settings. - AllowOverride all - - - +# +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# The configuration directives are grouped into three basic sections: +# 1. Directives that control the operation of the Apache server process as a +# whole (the 'global environment'). +# 2. Directives that define the parameters of the 'main' or 'default' server, +# which responds to requests that aren't handled by a virtual host. +# These directives also provide default values for the settings +# of all virtual hosts. +# 3. Settings for virtual hosts, which allow Web requests to be sent to +# different IP addresses or hostnames and have them handled by the +# same Apache server process. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" +# with ServerRoot set to "/etc/httpd" will be interpreted by the +# server as "/etc/httpd/logs/foo.log". +# + +### Section 1: Global Environment +# +# The directives in this section affect the overall operation of Apache, +# such as the number of concurrent requests it can handle or where it +# can find its configuration files. +# + +# +# Don't give away too much information about all the subcomponents +# we are running. Comment out this line if you don't mind remote sites +# finding out what major optional modules you are running +ServerTokens OS + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the LockFile documentation +# (available at ); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +ServerRoot "/etc/httpd" + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. Note the PIDFILE variable in +# /etc/sysconfig/httpd must be set appropriately if this location is +# changed. +# +PidFile run/httpd.pid + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 60 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive Off + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 15 + +## +## Server-Pool Size Regulation (MPM specific) +## + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# ServerLimit: maximum value for MaxClients for the lifetime of the server +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 8 +MinSpareServers 5 +MaxSpareServers 20 +ServerLimit 256 +MaxClients 256 +MaxRequestsPerChild 4000 + + +# worker MPM +# StartServers: initial number of server processes to start +# MaxClients: maximum number of simultaneous client connections +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxRequestsPerChild: maximum number of requests a server process serves + +StartServers 4 +MaxClients 300 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +MaxRequestsPerChild 0 + + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, in addition to the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +LoadModule auth_basic_module modules/mod_auth_basic.so +LoadModule auth_digest_module modules/mod_auth_digest.so +LoadModule authn_file_module modules/mod_authn_file.so +LoadModule authn_alias_module modules/mod_authn_alias.so +LoadModule authn_anon_module modules/mod_authn_anon.so +LoadModule authn_dbm_module modules/mod_authn_dbm.so +LoadModule authn_default_module modules/mod_authn_default.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule authz_user_module modules/mod_authz_user.so +LoadModule authz_owner_module modules/mod_authz_owner.so +LoadModule authz_groupfile_module modules/mod_authz_groupfile.so +LoadModule authz_dbm_module modules/mod_authz_dbm.so +LoadModule authz_default_module modules/mod_authz_default.so +LoadModule ldap_module modules/mod_ldap.so +LoadModule authnz_ldap_module modules/mod_authnz_ldap.so +LoadModule include_module modules/mod_include.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule logio_module modules/mod_logio.so +LoadModule env_module modules/mod_env.so +LoadModule ext_filter_module modules/mod_ext_filter.so +LoadModule mime_magic_module modules/mod_mime_magic.so +LoadModule expires_module modules/mod_expires.so +LoadModule deflate_module modules/mod_deflate.so +LoadModule headers_module modules/mod_headers.so +LoadModule usertrack_module modules/mod_usertrack.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule mime_module modules/mod_mime.so +LoadModule dav_module modules/mod_dav.so +LoadModule status_module modules/mod_status.so +LoadModule autoindex_module modules/mod_autoindex.so +LoadModule info_module modules/mod_info.so +LoadModule dav_fs_module modules/mod_dav_fs.so +LoadModule vhost_alias_module modules/mod_vhost_alias.so +LoadModule negotiation_module modules/mod_negotiation.so +LoadModule dir_module modules/mod_dir.so +LoadModule actions_module modules/mod_actions.so +LoadModule speling_module modules/mod_speling.so +LoadModule userdir_module modules/mod_userdir.so +LoadModule alias_module modules/mod_alias.so +LoadModule substitute_module modules/mod_substitute.so +LoadModule rewrite_module modules/mod_rewrite.so +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_balancer_module modules/mod_proxy_balancer.so +LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +LoadModule proxy_connect_module modules/mod_proxy_connect.so +LoadModule cache_module modules/mod_cache.so +LoadModule suexec_module modules/mod_suexec.so +LoadModule disk_cache_module modules/mod_disk_cache.so +LoadModule cgi_module modules/mod_cgi.so +LoadModule version_module modules/mod_version.so + +# Ruby on Rails Passenger mod_rails + LoadModule passenger_module /home/dmpdev/.rvm/gems/ruby-2.0.0-p247/gems/passenger-4.0.10/buildout/apache2/mod_passenger.so + PassengerRoot /home/dmpdev/.rvm/gems/ruby-2.0.0-p247/gems/passenger-4.0.10 + PassengerDefaultRuby /home/dmpdev/.rvm/wrappers/ruby-2.0.0-p247/ruby + +# +# The following modules are not loaded by default: +# +#LoadModule asis_module modules/mod_asis.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so +#LoadModule cern_meta_module modules/mod_cern_meta.so +#LoadModule cgid_module modules/mod_cgid.so +#LoadModule dbd_module modules/mod_dbd.so +#LoadModule dumpio_module modules/mod_dumpio.so +#LoadModule filter_module modules/mod_filter.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule unique_id_module modules/mod_unique_id.so +# + +# +# Load config files from the config directory "/etc/httpd/conf.d". +# +Include conf.d/*.conf + +# +# ExtendedStatus controls whether Apache will generate "full" status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the "server-status" handler is called. The default is Off. +# +#ExtendedStatus On + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# . On SCO (ODT 3) use "User nouser" and "Group nogroup". +# . On HPUX you may not be able to use shared memory as nobody, and the +# suggested workaround is to create a user www and use that user. +# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) +# when the value of (unsigned)Group is above 60000; +# don't use Group #-1 on these systems! +# +User apache +Group apache + +### Section 2: 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If this is not set to valid DNS name for your host, server-generated +# redirections will not work. See also the UseCanonicalName directive. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# You will have to access it by its address anyway, and this will make +# redirections work in a sensible way. +# +#ServerName www.example.com:80 + +# +# UseCanonicalName: Determines how Apache constructs self-referencing +# URLs and the SERVER_NAME and SERVER_PORT variables. +# When set "Off", Apache will use the Hostname and Port supplied +# by the client. When set "On", Apache will use the value of the +# ServerName directive. +# +UseCanonicalName Off + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/var/www/html" + +# +# Each directory to which Apache has access can be configured with respect +# to which services and features are allowed and/or disabled in that +# directory (and its subdirectories). +# +# First, we configure the "default" to be a very restrictive set of +# features. +# + + Options FollowSymLinks + AllowOverride None + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# This should be changed to whatever you set DocumentRoot to. +# + + +# +# Possible values for the Options directive are "None", "All", +# or any combination of: +# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews +# +# Note that "MultiViews" must be named *explicitly* --- "Options All" +# doesn't give it to you. +# +# The Options directive is both complicated and important. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#options +# for more information. +# + Options Indexes FollowSymLinks + +# +# AllowOverride controls what directives may be placed in .htaccess files. +# It can be "All", "None", or any combination of the keywords: +# Options FileInfo AuthConfig Limit +# + AllowOverride None + +# +# Controls who can get stuff from this server. +# + Order allow,deny + Allow from all + + + +# +# UserDir: The name of the directory that is appended onto a user's home +# directory if a ~user request is received. +# +# The path to the end user account 'public_html' directory must be +# accessible to the webserver userid. This usually means that ~userid +# must have permissions of 711, ~userid/public_html must have permissions +# of 755, and documents contained therein must be world-readable. +# Otherwise, the client will only receive a "403 Forbidden" message. +# +# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden +# + + # + # UserDir is disabled by default since it can confirm the presence + # of a username on the system (depending on home directory + # permissions). + # + UserDir disabled + + # + # To enable requests to /~user/ to serve the user's public_html + # directory, remove the "UserDir disabled" line above, and uncomment + # the following line instead: + # + #UserDir public_html + + + +# +# Control access to UserDir directories. The following is an example +# for a site where these directories are restricted to read-only. +# +# +# AllowOverride FileInfo AuthConfig Limit +# Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec +# +# Order allow,deny +# Allow from all +# +# +# Order deny,allow +# Deny from all +# +# + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# +# The index.html.var file (a type-map) is used to deliver content- +# negotiated documents. The MultiViews Option can be used for the +# same purpose, but it is much slower. +# +DirectoryIndex index.html index.html.var + +# +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Order allow,deny + Deny from all + Satisfy All + + +# +# TypesConfig describes where the mime.types file (or equivalent) is +# to be found. +# +TypesConfig /etc/mime.types + +# +# DefaultType is the default MIME type the server will use for a document +# if it cannot otherwise determine one, such as from filename extensions. +# If your server contains mostly text or HTML documents, "text/plain" is +# a good value. If most of your content is binary, such as applications +# or images, you may want to use "application/octet-stream" instead to +# keep browsers from trying to display binary files as though they are +# text. +# +DefaultType text/plain + +# +# The mod_mime_magic module allows the server to use various hints from the +# contents of the file itself to determine its type. The MIMEMagicFile +# directive tells the module where the hint definitions are located. +# + +# MIMEMagicFile /usr/share/magic.mime + MIMEMagicFile conf/magic + + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# +# EnableMMAP: Control whether memory-mapping is used to deliver +# files (assuming that the underlying OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. On some systems, turning it off (regardless of +# filesystem) can improve performance; for details, please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap +# +#EnableMMAP off + +# +# EnableSendfile: Control whether the sendfile kernel support is +# used to deliver files (assuming that the OS supports it). +# The default is on; turn this off if you serve from NFS-mounted +# filesystems. Please see +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile +# +#EnableSendfile off + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog logs/error_log + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + +# +# The following directives define some format nicknames for use with +# a CustomLog directive (see below). +# +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this +# requires the mod_logio module to be loaded. +#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + +# +# The location and format of the access logfile (Common Logfile Format). +# If you do not define any access logfiles within a +# container, they will be logged here. Contrariwise, if you *do* +# define per- access logfiles, transactions will be +# logged therein and *not* in this file. +# +#CustomLog logs/access_log common + +# +# If you would like to have separate agent and referer logfiles, uncomment +# the following directives. +# +#CustomLog logs/referer_log referer +#CustomLog logs/agent_log agent + +# +# For a single logfile with access, agent, and referer information +# (Combined Logfile Format), use the following directive: +# +CustomLog logs/access_log combined + +# +# Optionally add a line containing the server version and virtual host +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated +# documents or custom error documents). +# Set to "EMail" to also include a mailto: link to the ServerAdmin. +# Set to one of: On | Off | EMail +# +ServerSignature On + +# +# Aliases: Add here as many aliases as you need (with no limit). The format is +# Alias fakename realname +# +# Note that if you include a trailing / on fakename then the server will +# require it to be present in the URL. So "/icons" isn't aliased in this +# example, only "/icons/". If the fakename is slash-terminated, then the +# realname must also be slash terminated, and if the fakename omits the +# trailing slash, the realname must also omit it. +# +# We include the /icons/ alias for FancyIndexed directory listings. If you +# do not use FancyIndexing, you may comment this out. +# +Alias /icons/ "/var/www/icons/" + + + Options Indexes MultiViews FollowSymLinks + AllowOverride None + Order allow,deny + Allow from all + + +# +# WebDAV module configuration section. +# + + # Location of the WebDAV lock database. + DAVLockDB /var/lib/dav/lockdb + + +# +# ScriptAlias: This controls which directories contain server scripts. +# ScriptAliases are essentially the same as Aliases, except that +# documents in the realname directory are treated as applications and +# run by the server when requested rather than as documents sent to the client. +# The same rules about trailing "/" apply to ScriptAlias directives as to +# Alias. +# +ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Order allow,deny + Allow from all + + +# +# Redirect allows you to tell clients about documents which used to exist in +# your server's namespace, but do not anymore. This allows you to tell the +# clients where to look for the relocated document. +# Example: +# Redirect permanent /foo http://www.example.com/bar + +# +# Directives controlling the display of server-generated directory listings. +# + +# +# IndexOptions: Controls the appearance of server-generated directory +# listings. +# +IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8 + +# +# AddIcon* directives tell the server which icon to show for different +# files or filename extensions. These are only displayed for +# FancyIndexed directories. +# +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip + +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +# +# DefaultIcon is which icon to show for files which do not have an icon +# explicitly set. +# +DefaultIcon /icons/unknown.gif + +# +# AddDescription allows you to place a short description after a file in +# server-generated indexes. These are only displayed for FancyIndexed +# directories. +# Format: AddDescription "description" filename +# +#AddDescription "GZIP compressed document" .gz +#AddDescription "tar archive" .tar +#AddDescription "GZIP compressed tar archive" .tgz + +# +# ReadmeName is the name of the README file the server will look for by +# default, and append to directory listings. +# +# HeaderName is the name of a file which should be prepended to +# directory indexes. +ReadmeName README.html +HeaderName HEADER.html + +# +# IndexIgnore is a set of filenames which directory indexing should ignore +# and not include in the listing. Shell-style wildcarding is permitted. +# +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t + +# +# DefaultLanguage and AddLanguage allows you to specify the language of +# a document. You can then use content negotiation to give a browser a +# file in a language the user can understand. +# +# Specify a default language. This means that all data +# going out without a specific language tag (see below) will +# be marked with this one. You probably do NOT want to set +# this unless you are sure it is correct for all cases. +# +# * It is generally better to not mark a page as +# * being a certain language than marking it with the wrong +# * language! +# +# DefaultLanguage nl +# +# Note 1: The suffix does not have to be the same as the language +# keyword --- those with documents in Polish (whose net-standard +# language code is pl) may wish to use "AddLanguage pl .po" to +# avoid the ambiguity with the common suffix for perl scripts. +# +# Note 2: The example entries below illustrate that in some cases +# the two character 'Language' abbreviation is not identical to +# the two character 'Country' code for its country, +# E.g. 'Danmark/dk' versus 'Danish/da'. +# +# Note 3: In the case of 'ltz' we violate the RFC by using a three char +# specifier. There is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl) +# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de) +# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja) +# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn) +# Norwegian (no) - Polish (pl) - Portugese (pt) +# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv) +# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW) +# +AddLanguage ca .ca +AddLanguage cs .cz .cs +AddLanguage da .dk +AddLanguage de .de +AddLanguage el .el +AddLanguage en .en +AddLanguage eo .eo +AddLanguage es .es +AddLanguage et .et +AddLanguage fr .fr +AddLanguage he .he +AddLanguage hr .hr +AddLanguage it .it +AddLanguage ja .ja +AddLanguage ko .ko +AddLanguage ltz .ltz +AddLanguage nl .nl +AddLanguage nn .nn +AddLanguage no .no +AddLanguage pl .po +AddLanguage pt .pt +AddLanguage pt-BR .pt-br +AddLanguage ru .ru +AddLanguage sv .sv +AddLanguage zh-CN .zh-cn +AddLanguage zh-TW .zh-tw + +# +# LanguagePriority allows you to give precedence to some languages +# in case of a tie during content negotiation. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You probably want to change this. +# +LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW + +# +# ForceLanguagePriority allows you to serve a result page rather than +# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback) +# [in case no accepted languages matched the available variants] +# +ForceLanguagePriority Prefer Fallback + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + +# +# AddType allows you to add to or override the MIME configuration +# file mime.types for specific file types. +# +#AddType application/x-tar .tgz + +# +# AddEncoding allows you to have certain browsers uncompress +# information on the fly. Note: Not all browsers support this. +# Despite the name similarity, the following Add* directives have nothing +# to do with the FancyIndexing customization directives above. +# +#AddEncoding x-compress .Z +#AddEncoding x-gzip .gz .tgz + +# If the AddEncoding directives above are commented-out, then you +# probably should define those extensions to indicate media types: +# +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz + +# +# MIME-types for downloading Certificates and CRLs +# +AddType application/x-x509-ca-cert .crt +AddType application/x-pkcs7-crl .crl + +# +# AddHandler allows you to map certain file extensions to "handlers": +# actions unrelated to filetype. These can be either built into the server +# or added with the Action directive (see below) +# +# To use CGI scripts outside of ScriptAliased directories: +# (You will also need to add "ExecCGI" to the "Options" directive.) +# +#AddHandler cgi-script .cgi + +# +# For files that include their own HTTP headers: +# +#AddHandler send-as-is asis + +# +# For type maps (negotiated resources): +# (This is enabled by default to allow the Apache "It Worked" page +# to be distributed in multiple languages.) +# +AddHandler type-map var + +# +# Filters allow you to process content before it is sent to the client. +# +# To parse .shtml files for server-side includes (SSI): +# (You will also need to add "Includes" to the "Options" directive.) +# +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml + +# +# Action lets you define media types that will execute a script whenever +# a matching file is called. This eliminates the need for repeated URL +# pathnames for oft-used CGI file processors. +# Format: Action media/type /cgi-script/location +# Format: Action handler-name /cgi-script/location +# + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# Putting this all together, we can internationalize error responses. +# +# We use Alias to redirect any /error/HTTP_.html.var response to +# our collection of by-error message multi-language collections. We use +# includes to substitute the appropriate text. +# +# You can modify the messages' appearance without changing any of the +# default HTTP_.html.var files by adding the line: +# +# Alias /error/include/ "/your/include/path/" +# +# which allows you to create your own set of files by starting with the +# /var/www/error/include/ files and +# copying them to /your/include/path/, even on a per-VirtualHost basis. +# + +Alias /error/ "/var/www/error/" + + + + + AllowOverride None + Options IncludesNoExec + AddOutputFilter Includes html + AddHandler type-map var + Order allow,deny + Allow from all + LanguagePriority en es de fr + ForceLanguagePriority Prefer Fallback + + +# ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var +# ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var +# ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var +# ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var +# ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var +# ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var +# ErrorDocument 410 /error/HTTP_GONE.html.var +# ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var +# ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var +# ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var +# ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var +# ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var +# ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var +# ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var +# ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var +# ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var +# ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var + + + + +# +# The following directives modify normal HTTP response behavior to +# handle known problems with browser implementations. +# +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4\.0" force-response-1.0 +BrowserMatch "Java/1\.0" force-response-1.0 +BrowserMatch "JDK/1\.0" force-response-1.0 + +# +# The following directive disables redirects on non-GET requests for +# a directory that does not include the trailing slash. This fixes a +# problem with Microsoft WebFolders which does not appropriately handle +# redirects for folders with DAV methods. +# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. +# +BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully +BrowserMatch "MS FrontPage" redirect-carefully +BrowserMatch "^WebDrive" redirect-carefully +BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully +BrowserMatch "^gnome-vfs/1.0" redirect-carefully +BrowserMatch "^XML Spy" redirect-carefully +BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully + +# +# Allow server status reports generated by mod_status, +# with the URL of http://servername/server-status +# Change the ".example.com" to match your domain to enable. +# +# +# SetHandler server-status +# Order deny,allow +# Deny from all +# Allow from .example.com +# + +# +# Allow remote server configuration reports, with the URL of +# http://servername/server-info (requires that mod_info.c be loaded). +# Change the ".example.com" to match your domain to enable. +# +# +# SetHandler server-info +# Order deny,allow +# Deny from all +# Allow from .example.com +# + +# +# Proxy Server directives. Uncomment the following lines to +# enable the proxy server: +# +# +#ProxyRequests On +# +# +# Order deny,allow +# Deny from all +# Allow from .example.com +# + +# +# Enable/disable the handling of HTTP/1.1 "Via:" headers. +# ("Full" adds the server version; "Block" removes all outgoing Via: headers) +# Set to one of: Off | On | Full | Block +# +#ProxyVia On + +# +# To enable a cache of proxied content, uncomment the following lines. +# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details. +# +# +# CacheEnable disk / +# CacheRoot "/var/cache/mod_proxy" +# +# + +# +# End of proxy directives. + +### Section 3: Virtual Hosts +# +# VirtualHost: If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. Most configurations +# use only name-based virtual hosts so the server doesn't need to worry about +# IP addresses. This is indicated by the asterisks in the directives below. +# +# Please see the documentation at +# +# for further details before you try to setup virtual hosts. +# +# You may use the command line option '-S' to verify your virtual host +# configuration. + +# +# Use name-based virtual hosting. +# +#NameVirtualHost *:80 +# +# NOTE: NameVirtualHost cannot be used without a port specifier +# (e.g. :80) if mod_ssl is being used, due to the nature of the +# SSL protocol. +# + +# +# VirtualHost example: +# Almost any Apache directive may go into a VirtualHost container. +# The first VirtualHost section is used for requests without a known +# server name. +# +# +# ServerAdmin webmaster@dummy-host.example.com +# DocumentRoot /www/docs/dummy-host.example.com +# ServerName dummy-host.example.com +# ErrorLog logs/dummy-host.example.com-error_log +# CustomLog logs/dummy-host.example.com-access_log common +# + +#NameVirtualHost *:80 +# + + ServerName dmponline-test.dcc.ac.uk + # !!! Be sure to point DocumentRoot to 'public'! + DocumentRoot /var/www/html/dmponline_v4/public + Alias /maintenance/ "/var/www/html/maintenance/" + ErrorDocument 403 /maintenance/403.html + + Order Deny,Allow + # Always open to allow serving of 403 error page + Deny from none + Allow from all + + + Options -MultiViews + RewriteEngine On + RewriteRule ^/?(.*)$ https://dmponline-test.dcc.ac.uk/$1 [QSA,R=permanent] # This relaxes Apache security settings. + AllowOverride all + + + diff --git a/app/assets/stylesheets/select2.css b/app/assets/stylesheets/select2.css index 5ee2f77..2fc34c9 100644 --- a/app/assets/stylesheets/select2.css +++ b/app/assets/stylesheets/select2.css @@ -1,641 +1,641 @@ -/* -Version: 3.4.2 Timestamp Mon Aug 12 15:04:12 PDT 2013 -*/ -.select2-container { - margin: 0; - position: relative; - display: inline-block; - /* inline-block for ie7 */ - zoom: 1; - *display: inline; - vertical-align: middle; -} - -.select2-container, -.select2-drop, -.select2-search, -.select2-search input { - /* - Force border-box so that % widths fit the parent - container without overlap because of margin/padding. - - More Info : http://www.quirksmode.org/css/box.html - */ - -webkit-box-sizing: border-box; /* webkit */ - -moz-box-sizing: border-box; /* firefox */ - box-sizing: border-box; /* css3 */ -} - -.select2-container .select2-choice { - display: block; - height: 26px; - padding: 0 0 0 8px; - overflow: hidden; - position: relative; - - border: 1px solid #aaa; - white-space: nowrap; - line-height: 26px; - color: #444; - text-decoration: none; - - border-radius: 4px; - - background-clip: padding-box; - - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - background-color: #fff; - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff)); - background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%); - background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%); - background-image: -o-linear-gradient(bottom, #eee 0%, #fff 50%); - background-image: -ms-linear-gradient(top, #fff 0%, #eee 50%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0); - background-image: linear-gradient(top, #fff 0%, #eee 50%); -} - -.select2-container .select2-chosen { - color: #444444; -} - -.select2-container.select2-drop-above .select2-choice { - border-bottom-color: #aaa; - - border-radius: 0 0 4px 4px; - - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.9, #fff)); - background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%); - background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%); - background-image: -o-linear-gradient(bottom, #eee 0%, #fff 90%); - background-image: -ms-linear-gradient(top, #eee 0%, #fff 90%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0); - background-image: linear-gradient(top, #eee 0%, #fff 90%); -} - -.select2-container.select2-allowclear .select2-choice .select2-chosen { - margin-right: 42px; -} - -.select2-container .select2-choice > .select2-chosen { - margin-right: 26px; - display: block; - overflow: hidden; - - white-space: nowrap; - - text-overflow: ellipsis; -} - -.select2-container .select2-choice abbr { - display: none; - width: 12px; - height: 12px; - position: absolute; - right: 24px; - top: 8px; - - font-size: 1px; - text-decoration: none; - - border: 0; - background: url('/assets/select2.png') right top no-repeat; - cursor: pointer; - outline: 0; -} - -.select2-container.select2-allowclear .select2-choice abbr { - display: inline-block; -} - -.select2-container .select2-choice abbr:hover { - background-position: right -11px; - cursor: pointer; -} - -.select2-drop-mask { - border: 0; - margin: 0; - padding: 0; - position: fixed; - left: 0; - top: 0; - min-height: 100%; - min-width: 100%; - height: auto; - width: auto; - opacity: 0; - z-index: 9998; - /* styles required for IE to work */ - background-color: #fff; - opacity: 0; - filter: alpha(opacity=0); -} - -.select2-drop { - width: 100%; - margin-top: -1px; - position: absolute; - z-index: 9999; - top: 100%; - - background: #fff; - color: #000; - border: 1px solid #aaa; - border-top: 0; - - border-radius: 0 0 4px 4px; - - -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); - box-shadow: 0 4px 5px rgba(0, 0, 0, .15); -} - -.select2-drop-auto-width { - border-top: 1px solid #aaa; - width: auto; -} - -.select2-drop-auto-width .select2-search { - padding-top: 4px; -} - -.select2-drop.select2-drop-above { - margin-top: 1px; - border-top: 1px solid #aaa; - border-bottom: 0; - - border-radius: 4px 4px 0 0; - - -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); - box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); -} - -.select2-drop-active { - border: 1px solid #5897fb; - border-top: none; -} - -.select2-drop.select2-drop-above.select2-drop-active { - border-top: 1px solid #5897fb; -} - -.select2-container .select2-choice .select2-arrow { - display: inline-block; - width: 18px; - height: 100%; - position: absolute; - right: 0; - top: 0; - - border-left: 1px solid #aaa; - border-radius: 0 4px 4px 0; - - background-clip: padding-box; - - background: #ccc; - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee)); - background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%); - background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%); - background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%); - background-image: -ms-linear-gradient(top, #ccc 0%, #eee 60%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0); - background-image: linear-gradient(top, #ccc 0%, #eee 60%); -} - -.select2-container .select2-choice .select2-arrow b { - display: block; - width: 100%; - height: 100%; - background: url('/assets/select2.png') no-repeat 0 1px; -} - -.select2-search { - display: inline-block; - width: 100%; - min-height: 26px; - margin: 0; - padding-left: 4px; - padding-right: 4px; - - position: relative; - z-index: 10000; - - white-space: nowrap; -} - -.select2-search input { - width: 100%; - height: auto !important; - min-height: 26px; - padding: 4px 20px 4px 5px; - margin: 0; - - outline: 0; - font-family: sans-serif; - font-size: 1em; - - border: 1px solid #aaa; - border-radius: 0; - - -webkit-box-shadow: none; - box-shadow: none; - - background: #fff url('/assets/select2.png') no-repeat 100% -22px; - background: url('/assets/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url('/assets/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url('/assets/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url('/assets/select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, #fff 85%, #eee 99%); - background: url('/assets/select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #fff 85%, #eee 99%); - background: url('/assets/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%); -} - -.select2-drop.select2-drop-above .select2-search input { - margin-top: 4px; -} - -.select2-search input.select2-active { - background: #fff url('/assets/select2-spinner.gif') no-repeat 100%; - background: url('/assets/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); - background: url('/assets/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url('/assets/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); - background: url('/assets/select2-spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, #fff 85%, #eee 99%); - background: url('/assets/select2-spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #fff 85%, #eee 99%); - background: url('/assets/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%); -} - -.select2-container-active .select2-choice, -.select2-container-active .select2-choices { - border: 1px solid #5897fb; - outline: none; - - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); - box-shadow: 0 0 5px rgba(0, 0, 0, .3); -} - -.select2-dropdown-open .select2-choice { - border-bottom-color: transparent; - -webkit-box-shadow: 0 1px 0 #fff inset; - box-shadow: 0 1px 0 #fff inset; - - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - - background-color: #eee; - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.5, #eee)); - background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%); - background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%); - background-image: -o-linear-gradient(bottom, #fff 0%, #eee 50%); - background-image: -ms-linear-gradient(top, #fff 0%, #eee 50%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); - background-image: linear-gradient(top, #fff 0%, #eee 50%); -} - -.select2-dropdown-open.select2-drop-above .select2-choice, -.select2-dropdown-open.select2-drop-above .select2-choices { - border: 1px solid #5897fb; - border-top-color: transparent; - - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(0.5, #eee)); - background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%); - background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%); - background-image: -o-linear-gradient(top, #fff 0%, #eee 50%); - background-image: -ms-linear-gradient(bottom, #fff 0%, #eee 50%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); - background-image: linear-gradient(bottom, #fff 0%, #eee 50%); -} - -.select2-dropdown-open .select2-choice .select2-arrow { - background: transparent; - border-left: none; - filter: none; -} -.select2-dropdown-open .select2-choice .select2-arrow b { - background-position: -18px 1px; -} - -/* results */ -.select2-results { - max-height: 200px; - padding: 0 0 0 4px; - margin: 4px 4px 4px 0; - position: relative; - overflow-x: hidden; - overflow-y: auto; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} - -.select2-results ul.select2-result-sub { - margin: 0; - padding-left: 0; -} - -.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px } -.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px } -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px } -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px } -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px } -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px } -.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px } - -.select2-results li { - list-style: none; - display: list-item; - background-image: none; -} - -.select2-results li.select2-result-with-children > .select2-result-label { - font-weight: bold; -} - -.select2-results .select2-result-label { - padding: 3px 7px 4px; - margin: 0; - cursor: pointer; - - min-height: 1em; - - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.select2-results .select2-highlighted { - background: #3875d7; - color: #fff; -} - -.select2-results li em { - background: #feffde; - font-style: normal; -} - -.select2-results .select2-highlighted em { - background: transparent; -} - -.select2-results .select2-highlighted ul { - background: #fff; - color: #000; -} - - -.select2-results .select2-no-results, -.select2-results .select2-searching, -.select2-results .select2-selection-limit { - background: #f4f4f4; - display: list-item; -} - -/* -disabled look for disabled choices in the results dropdown -*/ -.select2-results .select2-disabled.select2-highlighted { - color: #666; - background: #f4f4f4; - display: list-item; - cursor: default; -} -.select2-results .select2-disabled { - background: #f4f4f4; - display: list-item; - cursor: default; -} - -.select2-results .select2-selected { - display: none; -} - -.select2-more-results.select2-active { - background: #f4f4f4 url('/assets/select2-spinner.gif') no-repeat 100%; -} - -.select2-more-results { - background: #f4f4f4; - display: list-item; -} - -/* disabled styles */ - -.select2-container.select2-container-disabled .select2-choice { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #ddd; - cursor: default; -} - -.select2-container.select2-container-disabled .select2-choice .select2-arrow { - background-color: #f4f4f4; - background-image: none; - border-left: 0; -} - -.select2-container.select2-container-disabled .select2-choice abbr { - display: none; -} - - -/* multiselect */ - -.select2-container-multi .select2-choices { - height: auto !important; - height: 1%; - margin: 0; - padding: 0; - position: relative; - - border: 1px solid #aaa; - cursor: text; - overflow: hidden; - - background-color: #fff; - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff)); - background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%); - background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%); - background-image: -o-linear-gradient(top, #eee 1%, #fff 15%); - background-image: -ms-linear-gradient(top, #eee 1%, #fff 15%); - background-image: linear-gradient(top, #eee 1%, #fff 15%); -} - -.select2-locked { - padding: 3px 5px 3px 5px !important; -} - -.select2-container-multi .select2-choices { - min-height: 26px; -} - -.select2-container-multi.select2-container-active .select2-choices { - border: 1px solid #5897fb; - outline: none; - - -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); - box-shadow: 0 0 5px rgba(0, 0, 0, .3); -} -.select2-container-multi .select2-choices li { - float: left; - list-style: none; -} -.select2-container-multi .select2-choices .select2-search-field { - margin: 0; - padding: 0; - white-space: nowrap; -} - -.select2-container-multi .select2-choices .select2-search-field input { - padding: 5px; - margin: 1px 0; - - font-family: sans-serif; - font-size: 100%; - color: #666; - outline: 0; - border: 0; - -webkit-box-shadow: none; - box-shadow: none; - background: transparent !important; -} - -.select2-container-multi .select2-choices .select2-search-field input.select2-active { - background: #fff url('/assets/select2-spinner.gif') no-repeat 100% !important; -} - -.select2-default { - color: #999 !important; -} - -.select2-container-multi .select2-choices .select2-search-choice { - padding: 3px 5px 3px 18px; - margin: 3px 0 3px 5px; - position: relative; - - line-height: 13px; - color: #333; - cursor: default; - border: 1px solid #aaaaaa; - - border-radius: 3px; - - -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); - box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); - - background-clip: padding-box; - - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - background-color: #e4e4e4; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0); - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee)); - background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); - background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); - background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); - background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); - background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); -} -.select2-container-multi .select2-choices .select2-search-choice .select2-chosen { - cursor: default; -} -.select2-container-multi .select2-choices .select2-search-choice-focus { - background: #d4d4d4; -} - -.select2-search-choice-close { - display: block; - width: 12px; - height: 13px; - position: absolute; - right: 3px; - top: 4px; - - font-size: 1px; - outline: none; - background: url('/assets/select2.png') right top no-repeat; -} - -.select2-container-multi .select2-search-choice-close { - left: 3px; -} - -.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { - background-position: right -11px; -} -.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { - background-position: right -11px; -} - -/* disabled styles */ -.select2-container-multi.select2-container-disabled .select2-choices { - background-color: #f4f4f4; - background-image: none; - border: 1px solid #ddd; - cursor: default; -} - -.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { - padding: 3px 5px 3px 5px; - border: 1px solid #ddd; - background-image: none; - background-color: #f4f4f4; -} - -.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { display: none; - background: none; -} -/* end multiselect */ - - -.select2-result-selectable .select2-match, -.select2-result-unselectable .select2-match { - text-decoration: underline; -} - -.select2-offscreen, .select2-offscreen:focus { - clip: rect(0 0 0 0) !important; - width: 1px !important; - height: 1px !important; - border: 0 !important; - margin: 0 !important; - padding: 0 !important; - overflow: hidden !important; - position: absolute !important; - outline: 0 !important; - left: 0px !important; - top: 0px !important; -} - -.select2-display-none { - display: none; -} - -.select2-measure-scrollbar { - position: absolute; - top: -10000px; - left: -10000px; - width: 100px; - height: 100px; - overflow: scroll; -} -/* Retina-ize icons */ - -@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { - .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b { - background-image: url('/assets/select2x2.png') !important; - background-repeat: no-repeat !important; - background-size: 60px 40px !important; - } - .select2-search input { - background-position: 100% -21px !important; - } -} +/* +Version: 3.4.2 Timestamp Mon Aug 12 15:04:12 PDT 2013 +*/ +.select2-container { + margin: 0; + position: relative; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: middle; +} + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input { + /* + Force border-box so that % widths fit the parent + container without overlap because of margin/padding. + + More Info : http://www.quirksmode.org/css/box.html + */ + -webkit-box-sizing: border-box; /* webkit */ + -moz-box-sizing: border-box; /* firefox */ + box-sizing: border-box; /* css3 */ +} + +.select2-container .select2-choice { + display: block; + height: 26px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + + border: 1px solid #aaa; + white-space: nowrap; + line-height: 26px; + color: #444; + text-decoration: none; + + border-radius: 4px; + + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #fff; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff)); + background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%); + background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%); + background-image: -o-linear-gradient(bottom, #eee 0%, #fff 50%); + background-image: -ms-linear-gradient(top, #fff 0%, #eee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0); + background-image: linear-gradient(top, #fff 0%, #eee 50%); +} + +.select2-container .select2-chosen { + color: #444444; +} + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: #aaa; + + border-radius: 0 0 4px 4px; + + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.9, #fff)); + background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%); + background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%); + background-image: -o-linear-gradient(bottom, #eee 0%, #fff 90%); + background-image: -ms-linear-gradient(top, #eee 0%, #fff 90%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0); + background-image: linear-gradient(top, #eee 0%, #fff 90%); +} + +.select2-container.select2-allowclear .select2-choice .select2-chosen { + margin-right: 42px; +} + +.select2-container .select2-choice > .select2-chosen { + margin-right: 26px; + display: block; + overflow: hidden; + + white-space: nowrap; + + text-overflow: ellipsis; +} + +.select2-container .select2-choice abbr { + display: none; + width: 12px; + height: 12px; + position: absolute; + right: 24px; + top: 8px; + + font-size: 1px; + text-decoration: none; + + border: 0; + background: url('/assets/select2.png') right top no-repeat; + cursor: pointer; + outline: 0; +} + +.select2-container.select2-allowclear .select2-choice abbr { + display: inline-block; +} + +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; +} + +.select2-drop-mask { + border: 0; + margin: 0; + padding: 0; + position: fixed; + left: 0; + top: 0; + min-height: 100%; + min-width: 100%; + height: auto; + width: auto; + opacity: 0; + z-index: 9998; + /* styles required for IE to work */ + background-color: #fff; + opacity: 0; + filter: alpha(opacity=0); +} + +.select2-drop { + width: 100%; + margin-top: -1px; + position: absolute; + z-index: 9999; + top: 100%; + + background: #fff; + color: #000; + border: 1px solid #aaa; + border-top: 0; + + border-radius: 0 0 4px 4px; + + -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 4px 5px rgba(0, 0, 0, .15); +} + +.select2-drop-auto-width { + border-top: 1px solid #aaa; + width: auto; +} + +.select2-drop-auto-width .select2-search { + padding-top: 4px; +} + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid #aaa; + border-bottom: 0; + + border-radius: 4px 4px 0 0; + + -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); + box-shadow: 0 -4px 5px rgba(0, 0, 0, .15); +} + +.select2-drop-active { + border: 1px solid #5897fb; + border-top: none; +} + +.select2-drop.select2-drop-above.select2-drop-active { + border-top: 1px solid #5897fb; +} + +.select2-container .select2-choice .select2-arrow { + display: inline-block; + width: 18px; + height: 100%; + position: absolute; + right: 0; + top: 0; + + border-left: 1px solid #aaa; + border-radius: 0 4px 4px 0; + + background-clip: padding-box; + + background: #ccc; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee)); + background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%); + background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%); + background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%); + background-image: -ms-linear-gradient(top, #ccc 0%, #eee 60%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0); + background-image: linear-gradient(top, #ccc 0%, #eee 60%); +} + +.select2-container .select2-choice .select2-arrow b { + display: block; + width: 100%; + height: 100%; + background: url('/assets/select2.png') no-repeat 0 1px; +} + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + + position: relative; + z-index: 10000; + + white-space: nowrap; +} + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + + outline: 0; + font-family: sans-serif; + font-size: 1em; + + border: 1px solid #aaa; + border-radius: 0; + + -webkit-box-shadow: none; + box-shadow: none; + + background: #fff url('/assets/select2.png') no-repeat 100% -22px; + background: url('/assets/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('/assets/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('/assets/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('/assets/select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, #fff 85%, #eee 99%); + background: url('/assets/select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #fff 85%, #eee 99%); + background: url('/assets/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%); +} + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; +} + +.select2-search input.select2-active { + background: #fff url('/assets/select2-spinner.gif') no-repeat 100%; + background: url('/assets/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee)); + background: url('/assets/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('/assets/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%); + background: url('/assets/select2-spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, #fff 85%, #eee 99%); + background: url('/assets/select2-spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #fff 85%, #eee 99%); + background: url('/assets/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%); +} + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); + box-shadow: 0 0 5px rgba(0, 0, 0, .3); +} + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; + -webkit-box-shadow: 0 1px 0 #fff inset; + box-shadow: 0 1px 0 #fff inset; + + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + + background-color: #eee; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.5, #eee)); + background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%); + background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%); + background-image: -o-linear-gradient(bottom, #fff 0%, #eee 50%); + background-image: -ms-linear-gradient(top, #fff 0%, #eee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); + background-image: linear-gradient(top, #fff 0%, #eee 50%); +} + +.select2-dropdown-open.select2-drop-above .select2-choice, +.select2-dropdown-open.select2-drop-above .select2-choices { + border: 1px solid #5897fb; + border-top-color: transparent; + + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(0.5, #eee)); + background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%); + background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%); + background-image: -o-linear-gradient(top, #fff 0%, #eee 50%); + background-image: -ms-linear-gradient(bottom, #fff 0%, #eee 50%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0); + background-image: linear-gradient(bottom, #fff 0%, #eee 50%); +} + +.select2-dropdown-open .select2-choice .select2-arrow { + background: transparent; + border-left: none; + filter: none; +} +.select2-dropdown-open .select2-choice .select2-arrow b { + background-position: -18px 1px; +} + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} + +.select2-results ul.select2-result-sub { + margin: 0; + padding-left: 0; +} + +.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px } +.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px } + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; +} + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; +} + +.select2-results .select2-result-label { + padding: 3px 7px 4px; + margin: 0; + cursor: pointer; + + min-height: 1em; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.select2-results .select2-highlighted { + background: #3875d7; + color: #fff; +} + +.select2-results li em { + background: #feffde; + font-style: normal; +} + +.select2-results .select2-highlighted em { + background: transparent; +} + +.select2-results .select2-highlighted ul { + background: #fff; + color: #000; +} + + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-selection-limit { + background: #f4f4f4; + display: list-item; +} + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; +} +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; +} + +.select2-results .select2-selected { + display: none; +} + +.select2-more-results.select2-active { + background: #f4f4f4 url('/assets/select2-spinner.gif') no-repeat 100%; +} + +.select2-more-results { + background: #f4f4f4; + display: list-item; +} + +/* disabled styles */ + +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container.select2-container-disabled .select2-choice .select2-arrow { + background-color: #f4f4f4; + background-image: none; + border-left: 0; +} + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none; +} + + +/* multiselect */ + +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0; + position: relative; + + border: 1px solid #aaa; + cursor: text; + overflow: hidden; + + background-color: #fff; + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff)); + background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%); + background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%); + background-image: -o-linear-gradient(top, #eee 1%, #fff 15%); + background-image: -ms-linear-gradient(top, #eee 1%, #fff 15%); + background-image: linear-gradient(top, #eee 1%, #fff 15%); +} + +.select2-locked { + padding: 3px 5px 3px 5px !important; +} + +.select2-container-multi .select2-choices { + min-height: 26px; +} + +.select2-container-multi.select2-container-active .select2-choices { + border: 1px solid #5897fb; + outline: none; + + -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3); + box-shadow: 0 0 5px rgba(0, 0, 0, .3); +} +.select2-container-multi .select2-choices li { + float: left; + list-style: none; +} +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + margin: 1px 0; + + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + -webkit-box-shadow: none; + box-shadow: none; + background: transparent !important; +} + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: #fff url('/assets/select2-spinner.gif') no-repeat 100% !important; +} + +.select2-default { + color: #999 !important; +} + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid #aaaaaa; + + border-radius: 3px; + + -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05); + + background-clip: padding-box; + + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + background-color: #e4e4e4; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0); + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee)); + background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); + background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%); +} +.select2-container-multi .select2-choices .select2-search-choice .select2-chosen { + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; +} + +.select2-search-choice-close { + display: block; + width: 12px; + height: 13px; + position: absolute; + right: 3px; + top: 4px; + + font-size: 1px; + outline: none; + background: url('/assets/select2.png') right top no-repeat; +} + +.select2-container-multi .select2-search-choice-close { + left: 3px; +} + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -11px; +} +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -11px; +} + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #ddd; + background-image: none; + background-color: #f4f4f4; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { display: none; + background: none; +} +/* end multiselect */ + + +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; +} + +.select2-offscreen, .select2-offscreen:focus { + clip: rect(0 0 0 0) !important; + width: 1px !important; + height: 1px !important; + border: 0 !important; + margin: 0 !important; + padding: 0 !important; + overflow: hidden !important; + position: absolute !important; + outline: 0 !important; + left: 0px !important; + top: 0px !important; +} + +.select2-display-none { + display: none; +} + +.select2-measure-scrollbar { + position: absolute; + top: -10000px; + left: -10000px; + width: 100px; + height: 100px; + overflow: scroll; +} +/* Retina-ize icons */ + +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b { + background-image: url('/assets/select2x2.png') !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; + } + .select2-search input { + background-position: 100% -21px !important; + } +} diff --git a/app/assets/videos/index.files/html5video/.htaccess b/app/assets/videos/index.files/html5video/.htaccess index e79adac..98147a7 100644 --- a/app/assets/videos/index.files/html5video/.htaccess +++ b/app/assets/videos/index.files/html5video/.htaccess @@ -1,5 +1,5 @@ -AddType video/ogg .ogv -AddType video/mp4 .mp4 -AddType video/mp4 .m4v -AddType video/webm .webm -SetEnvIfNoCase Request_URI \.(ogv|mp4|m4v|webm)$ no-gzip dont-vary +AddType video/ogg .ogv +AddType video/mp4 .mp4 +AddType video/mp4 .m4v +AddType video/webm .webm +SetEnvIfNoCase Request_URI \.(ogv|mp4|m4v|webm)$ no-gzip dont-vary diff --git a/app/assets/videos/index.files/html5video/html5ext.js b/app/assets/videos/index.files/html5video/html5ext.js index e8e1a51..de28896 100644 --- a/app/assets/videos/index.files/html5video/html5ext.js +++ b/app/assets/videos/index.files/html5video/html5ext.js @@ -1,7 +1,7 @@ -/** - * EasyHTML5Video JavaScript Extension API version 1.2 - * Created by EasyHTML5Video.com - * Modified 13:05 25.07.2013 - * This file content fullscreen api - */ +/** + * EasyHTML5Video JavaScript Extension API version 1.2 + * Created by EasyHTML5Video.com + * Modified 13:05 25.07.2013 + * This file content fullscreen api + */ (function(){function j(t,s,i){if(t.addEventListener){t.addEventListener(s,i,false)}else{t.attachEvent("on"+s,i)}}function r(t,s,i){if(t.removeEventListener){t.removeEventListener(s,i)}else{t.detachEvent("on"+s,i)}}function o(u,t){if(!u.length){u=[u]}for(var v in t){for(var s=0;s=0;v--){if(!u[v].type){A=u[v].src}else{if(A&&/mp4/.test(u[v].type)){u[v].src=A;t.load()}}}}}if(!t||!t.canPlayType){var x=s.getElementsByTagName("object")[0]||s.getElementsByTagName("embed")[0];var C=x.height/x.width;x.setAttribute("width","100%");x.removeAttribute("height");var B=function(){x.style.height=s.offsetWidth*C+"px"};j(window,"resize",B);B()}}var b=m("easyhtml5video");for(var f=0;f] any active_reccord reccords which + # have the "created_at" field specified + # @return [Array] filtered list of objects + def restrict_date_range( objects ) + # set start_date to either passed param, or beginning of time + start_date = params[:start_date].blank? ? Date.new(0) : Date.strptime(params[:start_date], "%Y-%m-%d") + # set end_date to either passed param or now + end_date = params[:end_date].blank? ? Date.today : Date.strptime(params[:end_date], "%Y-%m-%d") + + filtered = [] + objects.each do |obj| + # apperantly things can have nil created_at + if obj.created_at.blank? + if params[:start_date].blank? && params[:end_date].blank? + filtered += [obj] + end + elsif start_date <= obj.created_at.to_date && end_date >= obj.created_at.to_date + filtered += [obj] + end + end + return filtered + end + end + end +end \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cbc894d..ecca66a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,10 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + include GlobalHelpers + + helper_method GlobalHelpers.instance_methods + # Override build_footer method in ActiveAdmin::Views::Pages require 'active_admin_views_pages_base.rb' @@ -14,17 +18,19 @@ def set_locale # parameter from url takes precedence - if params[:locale] + # check if locale is defined + if params[:locale] # and I18n.available_locales.include? params[:locale] # throw an error if not available # if locales data is present in the parameter from url use it - # TODO we need to error to the user that locale is missing, it can be THE CASE because there can be a missmatch between locales files and db I18n.locale = params[:locale] - elsif false # TODO + elsif user_signed_in? and !current_user[:language_id].nil? + I18n.locale = Language.find_by_id(current_user[:language_id]).abbreviation # if user has set preferred language use it - elsif false # TODO - # use user's organization language, keep in mine the "OTHER ORG" edge case which should use english + elsif user_signed_in? and current_user.organisation.present? and !current_user.organisation[:language_id].nil? + I18n.locale = Language.find_by_id(current_user.organisation[:language_id]).abbreviation + # use user's organization language, keep in mine the "OTHER ORG" edge case which should use default language else # just use the default language, line can be commented out, included just for clarity - # I18n.locale = config.i18n.default_locale + I18n.locale = I18n.default_locale end end diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb index 08843f2..ae9e85a 100644 --- a/app/controllers/contacts_controller.rb +++ b/app/controllers/contacts_controller.rb @@ -1,4 +1,7 @@ -class ContactsController < ContactUs::ContactsController +class ContactsController < ContactUs::ContactsController + + # in order to i18 this file recaptcha gem has to be updated + def create @contact = ContactUs::Contact.new(params[:contact_us_contact]) if (!user_signed_in?) diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb index 817c0d9..1c8d2d1 100644 --- a/app/controllers/guidances_controller.rb +++ b/app/controllers/guidances_controller.rb @@ -1,228 +1,228 @@ -class GuidancesController < ApplicationController - - # GET /guidances - # GET /guidances.json - def admin_index - if user_signed_in? && current_user.is_org_admin? then - @guidances = Guidance.by_organisation(current_user.organisation_id) - @guidance_groups = GuidanceGroup.where('organisation_id = ?', current_user.organisation_id ) - - - respond_to do |format| - format.html # index.html.erb - format.json { render json: @guidances } - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # GET /guidances/1 - # GET /guidances/1.json - def admin_show - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.json { render json: @guidance } - end - end - end - - def admin_new - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.new - @dmptemplates = Dmptemplate.funders_and_own_templates(current_user.organisation_id) - @phases = nil - @dmptemplates.each do |template| - if @phases.nil? then - @phases = template.phases.all.order('number') - else - @phases = @phases + template.phases.all.order('number') - end - end - @versions = nil - @phases.each do |phase| - if @versions.nil? then - @versions = phase.versions.all.order('title') - else - @versions = @versions + phase.versions.all.order('title') - end - end - @sections = nil - @versions.each do |version| - if @sections.nil? then - @sections = version.sections.all.order('number') - else - @sections = @sections + version.sections.all.order('number') - end - end - @questions = nil - @sections.each do |section| - if @questions.nil? then - @questions = section.questions.all.order('number') - else - @questions = @questions + section.questions.all.order('number') - end - end - respond_to do |format| - format.html - end - end - end - - #setup variables for use in the dynamic updating - def update_phases - # updates phases, versions, sections and questions based on template selected - dmptemplate = Dmptemplate.find(params[:dmptemplate_id]) - # map to title and id for use in our options_for_select - @phases = dmptemplate.phases.map{|a| [a.title, a.id]}.insert(0, I18n.t('helpers.select_phase')) - @versions = dmptemplate.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) - @sections = dmptemplate.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) - @questions = dmptemplate.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) - - end - - def update_versions - # updates versions, sections and questions based on phase selected - phase = Phase.find(params[:phase_id]) - # map to name and id for use in our options_for_select - @versions = phase.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) - @sections = phase.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) - @questions = phase.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) - end - - def update_sections - # updates sections and questions based on version selected - version = Version.find(params[:version_id]) - # map to name and id for use in our options_for_select - @sections = version.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) - @questions = version.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) - end - - def update_questions - # updates songs based on artist selected - section = Section.find(params[:section_id]) - @questions = section.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) - end - - - # GET /guidances/1/edit - def admin_edit - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.find(params[:id]) - @dmptemplates = Dmptemplate.funders_and_own_templates(current_user.organisation_id) - @phases = nil - @dmptemplates.each do |template| - if @phases.nil? then - @phases = template.phases.all.order('number') - else - @phases = @phases + template.phases.all.order('number') - end - end - @versions = nil - @phases.each do |phase| - if @versions.nil? then - @versions = phase.versions.all.order('title') - else - @versions = @versions + phase.versions.all.order('title') - end - end - @sections = nil - @versions.each do |version| - if @sections.nil? then - @sections = version.sections.all.order('number') - else - @sections = @sections + version.sections.all.order('number') - end - end - @questions = nil - @sections.each do |section| - if @questions.nil? then - @questions = section.questions.all.order('number') - else - @questions = @questions + section.questions.all.order('number') - end - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # POST /guidances - # POST /guidances.json - def admin_create - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.new(params[:guidance]) - @guidance.text = params["guidance-text"] - @guidance.question_id = params["question_id"] - if @guidance.published == true then - @gg = GuidanceGroup.find(@guidance.guidance_group_ids).first - - if @gg.published == false || @gg.published.nil? then - @gg.published = true - @gg.save - end - - end - - respond_to do |format| - if @guidance.save - format.html { redirect_to admin_show_guidance_path(@guidance), notice: I18n.t('org_admin.guidance.created_message') } - format.json { render json: @guidance, status: :created, location: @guidance } - else - format.html { render action: "new" } - format.json { render json: @guidance.errors, status: :unprocessable_entity } - end - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - # PUT /guidances/1 - # PUT /guidances/1.json - def admin_update - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.find(params[:id]) - - @guidance.text = params["guidance-text"] - - @guidance.question_id = params["question_id"] - - respond_to do |format| - if @guidance.update_attributes(params[:guidance]) - format.html { redirect_to admin_show_guidance_path(params[:guidance]), notice: I18n.t('org_admin.guidance.updated_message') } - format.json { head :no_content } - else - format.html { render action: "edit" } - format.json { render json: @guidance.errors, status: :unprocessable_entity } - end - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - - - # DELETE /guidances/1 - # DELETE /guidances/1.json - def admin_destroy - if user_signed_in? && current_user.is_org_admin? then - @guidance = Guidance.find(params[:id]) - @guidance.destroy - - respond_to do |format| - format.html { redirect_to admin_index_guidance_path } - format.json { head :no_content } - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - - end - - - -end +class GuidancesController < ApplicationController + + # GET /guidances + # GET /guidances.json + def admin_index + if user_signed_in? && current_user.is_org_admin? then + @guidances = Guidance.by_organisation(current_user.organisation_id) + @guidance_groups = GuidanceGroup.where('organisation_id = ?', current_user.organisation_id ) + + + respond_to do |format| + format.html # index.html.erb + format.json { render json: @guidances } + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + + # GET /guidances/1 + # GET /guidances/1.json + def admin_show + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @guidance } + end + end + end + + def admin_new + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.new + @dmptemplates = Dmptemplate.funders_and_own_templates(current_user.organisation_id) + @phases = nil + @dmptemplates.each do |template| + if @phases.nil? then + @phases = template.phases.all.order('number') + else + @phases = @phases + template.phases.all.order('number') + end + end + @versions = nil + @phases.each do |phase| + if @versions.nil? then + @versions = phase.versions.all.order('title') + else + @versions = @versions + phase.versions.all.order('title') + end + end + @sections = nil + @versions.each do |version| + if @sections.nil? then + @sections = version.sections.all.order('number') + else + @sections = @sections + version.sections.all.order('number') + end + end + @questions = nil + @sections.each do |section| + if @questions.nil? then + @questions = section.questions.all.order('number') + else + @questions = @questions + section.questions.all.order('number') + end + end + respond_to do |format| + format.html + end + end + end + + #setup variables for use in the dynamic updating + def update_phases + # updates phases, versions, sections and questions based on template selected + dmptemplate = Dmptemplate.find(params[:dmptemplate_id]) + # map to title and id for use in our options_for_select + @phases = dmptemplate.phases.map{|a| [a.title, a.id]}.insert(0, I18n.t('helpers.select_phase')) + @versions = dmptemplate.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) + @sections = dmptemplate.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = dmptemplate.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) + + end + + def update_versions + # updates versions, sections and questions based on phase selected + phase = Phase.find(params[:phase_id]) + # map to name and id for use in our options_for_select + @versions = phase.versions.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_version')) + @sections = phase.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = phase.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) + end + + def update_sections + # updates sections and questions based on version selected + version = Version.find(params[:version_id]) + # map to name and id for use in our options_for_select + @sections = version.sections.map{|s| [s.title, s.id]}.insert(0, I18n.t('helpers.select_section')) + @questions = version.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) + end + + def update_questions + # updates songs based on artist selected + section = Section.find(params[:section_id]) + @questions = section.questions.map{|s| [s.text, s.id]}.insert(0, I18n.t('helpers.select_question')) + end + + + # GET /guidances/1/edit + def admin_edit + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.find(params[:id]) + @dmptemplates = Dmptemplate.funders_and_own_templates(current_user.organisation_id) + @phases = nil + @dmptemplates.each do |template| + if @phases.nil? then + @phases = template.phases.all.order('number') + else + @phases = @phases + template.phases.all.order('number') + end + end + @versions = nil + @phases.each do |phase| + if @versions.nil? then + @versions = phase.versions.all.order('title') + else + @versions = @versions + phase.versions.all.order('title') + end + end + @sections = nil + @versions.each do |version| + if @sections.nil? then + @sections = version.sections.all.order('number') + else + @sections = @sections + version.sections.all.order('number') + end + end + @questions = nil + @sections.each do |section| + if @questions.nil? then + @questions = section.questions.all.order('number') + else + @questions = @questions + section.questions.all.order('number') + end + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + + # POST /guidances + # POST /guidances.json + def admin_create + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.new(params[:guidance]) + @guidance.text = params["guidance-text"] + @guidance.question_id = params["question_id"] + if @guidance.published == true then + @gg = GuidanceGroup.find(@guidance.guidance_group_ids).first + + if @gg.published == false || @gg.published.nil? then + @gg.published = true + @gg.save + end + + end + + respond_to do |format| + if @guidance.save + format.html { redirect_to admin_show_guidance_path(@guidance), notice: I18n.t('org_admin.guidance.created_message') } + format.json { render json: @guidance, status: :created, location: @guidance } + else + format.html { render action: "new" } + format.json { render json: @guidance.errors, status: :unprocessable_entity } + end + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + + # PUT /guidances/1 + # PUT /guidances/1.json + def admin_update + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.find(params[:id]) + + @guidance.text = params["guidance-text"] + + @guidance.question_id = params["question_id"] + + respond_to do |format| + if @guidance.update_attributes(params[:guidance]) + format.html { redirect_to admin_show_guidance_path(params[:guidance]), notice: I18n.t('org_admin.guidance.updated_message') } + format.json { head :no_content } + else + format.html { render action: "edit" } + format.json { render json: @guidance.errors, status: :unprocessable_entity } + end + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + + + # DELETE /guidances/1 + # DELETE /guidances/1.json + def admin_destroy + if user_signed_in? && current_user.is_org_admin? then + @guidance = Guidance.find(params[:id]) + @guidance.destroy + + respond_to do |format| + format.html { redirect_to admin_index_guidance_path } + format.json { head :no_content } + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + + end + + + +end diff --git a/app/controllers/organisation_users_controller.rb b/app/controllers/organisation_users_controller.rb index 4693650..6bdeeb3 100644 --- a/app/controllers/organisation_users_controller.rb +++ b/app/controllers/organisation_users_controller.rb @@ -1,25 +1,25 @@ -class OrganisationUsersController < ApplicationController - - def admin_index - if user_signed_in? && current_user.is_org_admin? then - # find excluded user_id's - excluded_ids = params[:user_ids] - excluded_ids.each do |user_id| - User.find(user_id).remove_token - end - # remove their api_tokens - # find included user id's - params[:user_ids].each do |user_id| - User.find(user_id).keep_or_generate_token - end - # keep_or_generate_token - respond_to do |format| - format.html # index.html.erb - format.json { render json: @organisation_users } - end - else - render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) - end - end - +class OrganisationUsersController < ApplicationController + + def admin_index + if user_signed_in? && current_user.is_org_admin? then + # find excluded user_id's + excluded_ids = params[:user_ids] + excluded_ids.each do |user_id| + User.find(user_id).remove_token + end + # remove their api_tokens + # find included user id's + params[:user_ids].each do |user_id| + User.find(user_id).keep_or_generate_token + end + # keep_or_generate_token + respond_to do |format| + format.html # index.html.erb + format.json { render json: @organisation_users } + end + else + render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) + end + end + end \ No newline at end of file diff --git a/app/controllers/project_groups_controller.rb b/app/controllers/project_groups_controller.rb index 776bad9..426b842 100644 --- a/app/controllers/project_groups_controller.rb +++ b/app/controllers/project_groups_controller.rb @@ -1,5 +1,5 @@ class ProjectGroupsController < ApplicationController - + def create @project_group = ProjectGroup.new(params[:project_group]) access_level = params[:project_group][:access_level].to_i @@ -24,11 +24,9 @@ @project_group.user = User.find_by_email(params[:project_group][:email]) @project_group.save UserMailer.sharing_notification(@project_group).deliver - logger.debug("Email sent from here?") end else UserMailer.sharing_notification(@project_group).deliver - logger.debug("Email sent from there?") end flash[:notice] = message format.html { redirect_to :controller => 'projects', :action => 'share', :id => @project_group.project.slug } @@ -42,13 +40,13 @@ format.html { redirect_to :controller => 'projects', :action => 'share', :id => @project_group.project.slug } format.json { render json: @project_group, status: :created, location: @project_group } end - end + end else render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) end - + end - + def update @project_group = ProjectGroup.find(params[:id]) access_level = params[:project_group][:access_level].to_i @@ -95,5 +93,4 @@ render(:file => File.join(Rails.root, 'public/403.html'), :status => 403, :layout => false) end end - end \ No newline at end of file diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 74b2a5f..1e04277 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -4,6 +4,7 @@ # GET /projects # GET /projects.json def index + ## TODO: Is this A magic String? the "Show_shib_link?" as we define it and users dont see cookies if user_signed_in? then if (current_user.shibboleth_id.nil? || current_user.shibboleth_id.length == 0) && !cookies[:show_shib_link].nil? && cookies[:show_shib_link] == "show_shib_link" then flash.notice = "Would you like to #{view_context.link_to I18n.t('helpers.shibboleth_to_link_text'), user_omniauth_shibboleth_path}".html_safe @@ -53,8 +54,8 @@ if user_signed_in? then @project = Project.new @project.organisation = current_user.organisation - @funders = orgs_of_type(t('helpers.org_type.funder'), true) - @institutions = orgs_of_type(t('helpers.org_type.institution')) + @funders = orgs_of_type(constant("organisation_types.funder"), true) + @institutions = orgs_of_type(constant("organisation_types.institution")) respond_to do |format| format.html # new.html.erb format.json { render json: @project } @@ -100,10 +101,10 @@ respond_to do |format| format.html { redirect_to edit_user_registration_path } end - else + else respond_to do |format| format.html { render action: "export" } - + end end end @@ -113,7 +114,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 @@ -127,7 +128,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| @@ -226,21 +227,21 @@ else institution = nil end - excluded_orgs = orgs_of_type(t('helpers.org_type.funder')) + orgs_of_type(t('helpers.org_type.institution')) + Organisation.orgs_with_parent_of_type(t('helpers.org_type.institution')) + excluded_orgs = orgs_of_type(constant("organisation_types.funder")) + orgs_of_type(constant("organisation_types.institution")) + Organisation.orgs_with_parent_of_type(constant("organisation_types.institution")) guidance_groups = {} ggs = GuidanceGroup.guidance_groups_excluding(excluded_orgs) - + ggs.each do |gg| guidance_groups[gg.id] = gg.name end - + #subset guidance that belong to the institution unless institution.nil? then optional_gg = GuidanceGroup.where("optional_subset = ? && organisation_id = ?", true, institution.id) optional_gg.each do|optional| guidance_groups[optional.id] = optional.name end - + institution.children.each do |o| o.guidance_groups.each do |gg| include = false @@ -256,21 +257,21 @@ end end end - + #If template belongs to a funder and that funder has subset guidance display then. - if !template.nil? && template.organisation.organisation_type.name == t('helpers.org_type.funder') then + if !template.nil? && template.organisation.organisation_type.name == constant("organisation_types.funder") then optional_gg = GuidanceGroup.where("optional_subset = ? && organisation_id = ?", true, template.organisation_id) optional_gg.each do|optional| guidance_groups[optional.id] = optional.name end end - - + + respond_to do |format| format.json { render json: guidance_groups.to_json } end end - + private def orgs_of_type(org_type_name, published_templates = false) diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 1dd578f..d7127bb 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -3,6 +3,7 @@ # POST /resource def create + logger.debug "#{sign_up_params}" if sign_up_params[:accept_terms] != "1" then redirect_to after_sign_up_error_path_for(resource), alert: I18n.t('helpers.you_must_accept') else diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index a86c0fa..5515afb 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,27 +1,27 @@ -# app/controllers/sessions_controller.rb -class SessionsController < Devise::SessionsController - - def create - existing_user = User.find_by_email(params[:user][:email]) - - if !existing_user.nil? && (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then - redirect_to :controller => :existing_users, :action => :index, :email => params[:user][:email] - else - #after authentication verify if session[:shibboleth] exists - if !params[:shibboleth_data].nil? then - existing_user.update_attributes(:shibboleth_id => session[:shibboleth_data][:uid]) - end - super - - end - end - - def destroy - current_user.plan_sections.each do |lock| - lock.delete - - end - super - end - +# app/controllers/sessions_controller.rb +class SessionsController < Devise::SessionsController + + def create + existing_user = User.find_by_email(params[:user][:email]) + + if !existing_user.nil? && (existing_user.password == "" || existing_user.password.nil?) && existing_user.confirmed_at.nil? then + redirect_to :controller => :existing_users, :action => :index, :email => params[:user][:email] + else + #after authentication verify if session[:shibboleth] exists + if !params[:shibboleth_data].nil? then + existing_user.update_attributes(:shibboleth_id => session[:shibboleth_data][:uid]) + end + super + + end + end + + def destroy + current_user.plan_sections.each do |lock| + lock.delete + + end + super + end + end \ No newline at end of file diff --git a/app/controllers/settings/projects_controller.rb b/app/controllers/settings/projects_controller.rb index b0df35c..5719f2c 100644 --- a/app/controllers/settings/projects_controller.rb +++ b/app/controllers/settings/projects_controller.rb @@ -1,40 +1,40 @@ -module Settings - class ProjectsController < SettingsController - - before_filter :get_plan_list_columns - before_filter :get_settings - - def show - respond_to do |format| - format.html - format.json { render json: settings_json } - end - end - - def update - columns = (params[:columns] || {}) - - if @settings.update_attributes(columns: columns) - respond_to do |format| - format.html { redirect_to(projects_path) } - format.json { render json: settings_json } - end - else - render(action: :show) # Expect #show to display errors etc - end - end - - private - - def get_settings - @settings = current_user.settings(:plan_list) - # :name column should always be present (displayed as a disabled checkbox) - # so it's not necessary to include it in the list here - @all_columns -= [:name] - end - - def settings_json - @settings_json ||= { selected_columns: @settings.columns, all_columns: @all_columns }.to_json - end - end -end +module Settings + class ProjectsController < SettingsController + + before_filter :get_plan_list_columns + before_filter :get_settings + + def show + respond_to do |format| + format.html + format.json { render json: settings_json } + end + end + + def update + columns = (params[:columns] || {}) + + if @settings.update_attributes(columns: columns) + respond_to do |format| + format.html { redirect_to(projects_path) } + format.json { render json: settings_json } + end + else + render(action: :show) # Expect #show to display errors etc + end + end + + private + + def get_settings + @settings = current_user.settings(:plan_list) + # :name column should always be present (displayed as a disabled checkbox) + # so it's not necessary to include it in the list here + @all_columns -= [:name] + end + + def settings_json + @settings_json ||= { selected_columns: @settings.columns, all_columns: @all_columns }.to_json + end + end +end diff --git a/app/controllers/token_permission_types_controller.rb b/app/controllers/token_permission_types_controller.rb index 4e1b33a..bdb6b58 100644 --- a/app/controllers/token_permission_types_controller.rb +++ b/app/controllers/token_permission_types_controller.rb @@ -1,15 +1,15 @@ -class TokenPermissionTypesController < ApplicationController - - - def index - if user_signed_in? && current_user.organisation.token_permission_types.count > 0 - @user = current_user - respond_to do |format| - format.html - end - else - render(file: File.join(Rails.root, 'public/403.html'),status: 403, layout: false) - end - end - +class TokenPermissionTypesController < ApplicationController + + + def index + if user_signed_in? && current_user.organisation.token_permission_types.count > 0 + @user = current_user + respond_to do |format| + format.html + end + else + render(file: File.join(Rails.root, 'public/403.html'),status: 403, layout: false) + end + end + end \ No newline at end of file diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8fad4df..5647a32 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + # GET /users/1 # GET /users/1.json def show @@ -85,22 +86,28 @@ def admin_api_update if user_signed_in? && current_user.is_org_admin? then #iterate through all org users + user_ids = params[:api_user_ids].blank? ? [] : params[:api_user_ids].map(&:to_i) + admin_user_ids = params[:org_admin_ids].blank? ? [] : params[:org_admin_ids].map(&:to_i) current_user.organisation.users.each do |user| - if !params[:user_ids].nil? - user_ids = params[:user_ids].map(&:to_i) - # if user_id in passed params - if user_ids.include? user.id - # run generate_or_keep - user.keep_or_generate_token! - # if not in passed params - else - # remove the token - user.remove_token! - end + # if user_id in passed params + if user_ids.include? user.id + # run generate_or_keep + user.keep_or_generate_token! + # if not in passed params else - # no users selected so remove all tokens + # remove the token user.remove_token! end + # ORG_ADMINS + if admin_user_ids.include?( user.id) && !user.is_org_admin? + # add admin privleges + # MAGIC_STRING + user.roles << Role.find_by(name: constant("user_role_types.organisational_admin")) + # if user_id not in passed, but user is an admin + elsif !admin_user_ids.include?(user.id) && user.is_org_admin? + # strip admin privleges + user.roles.delete(Role.find_by(name: constant("user_role_types.organisational_admin"))) + end end #redirect_to admin_index else diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb index f5cf56d..37a6355 100644 --- a/app/helpers/plans_helper.rb +++ b/app/helpers/plans_helper.rb @@ -1,13 +1,13 @@ module PlansHelper def project_list_head(column) - klass = case column[0] + klass = case column 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[0]}"), class: klass) + content_tag(:th, t("helpers.project.columns.#{column}"), class: klass) end def project_list_body(column, project) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 02c490e..8a60e7b 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,24 +1,24 @@ -class UserMailer < ActionMailer::Base - default from: I18n.t('helpers.main_email.from') - - def sharing_notification(project_group) - @project_group = project_group - mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.access_given')) - end - - def permissions_change_notification(project_group) - @project_group = project_group - mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.permission_changed')) - end - - def project_access_removed_notification(user, project) - @user = user - @project = project - mail(to: @user.email, subject: I18n.t('helpers.main_email.access_removed')) - end - - def api_token_granted_notification(user) - @user = user - mail(to: @user.email, subject: I18n.t('helper.api_mail_subject')) - end +class UserMailer < ActionMailer::Base + default from: I18n.t('helpers.main_email.from') + + def sharing_notification(project_group) + @project_group = project_group + mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.access_given')) + end + + def permissions_change_notification(project_group) + @project_group = project_group + mail(to: @project_group.user.email, subject: I18n.t('helpers.main_email.permission_changed')) + end + + def project_access_removed_notification(user, project) + @user = user + @project = project + mail(to: @user.email, subject: I18n.t('helpers.main_email.access_removed')) + end + + def api_token_granted_notification(user) + @user = user + mail(to: @user.email, subject: I18n.t('helper.api_mail_subject')) + end end \ No newline at end of file diff --git a/app/models/ability.rb b/app/models/ability.rb index b75a646..e283051 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,11 +1,12 @@ class Ability + include GlobalHelpers include CanCan::Ability def initialize(user) # Define abilities for the passed in user here. For example: # user ||= User.new # guest user (not logged in) - if user.has_role? :admin + if user.has_role? constant("user_role_types.super_admin") can :manage, :all else can :read, :all diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb index 28b7223..511e649 100644 --- a/app/models/admin_user.rb +++ b/app/models/admin_user.rb @@ -1,4 +1,4 @@ -class AdminUser < ActiveRecord::Base - devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable - attr_accessible :email, :password, :password_confirmation, :remember_me -end +class AdminUser < ActiveRecord::Base + devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable + attr_accessible :email, :password, :password_confirmation, :remember_me +end diff --git a/app/models/answer.rb b/app/models/answer.rb index 7c2e4dd..cadb66d 100644 --- a/app/models/answer.rb +++ b/app/models/answer.rb @@ -1,16 +1,16 @@ -class Answer < ActiveRecord::Base - - #associations between tables - belongs_to :question - belongs_to :user - belongs_to :plan - -# accepts_nested_attributes_for :question -# accepts_nested_attributes_for :plan - - has_and_belongs_to_many :options, join_table: "answers_options" - - attr_accessible :text, :plan_id, :question_id, :user_id, :option_ids , :as => [:default, :admin] - - -end +class Answer < ActiveRecord::Base + + #associations between tables + belongs_to :question + belongs_to :user + belongs_to :plan + +# accepts_nested_attributes_for :question +# accepts_nested_attributes_for :plan + + has_and_belongs_to_many :options, join_table: "answers_options" + + attr_accessible :text, :plan_id, :question_id, :user_id, :option_ids , :as => [:default, :admin] + + +end diff --git a/app/models/comment.rb b/app/models/comment.rb index a2fc503..b4af9f9 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,15 +1,15 @@ -class Comment < ActiveRecord::Base - - #associations between tables - belongs_to :question - - #fields - attr_accessible :question_id, :text, :user_id, :archived, :plan_id, :archived_by, :as => [:default, :admin] - - - - def to_s - "#{text}" - end - -end +class Comment < ActiveRecord::Base + + #associations between tables + belongs_to :question + + #fields + attr_accessible :question_id, :text, :user_id, :archived, :plan_id, :archived_by, :as => [:default, :admin] + + + + def to_s + "#{text}" + end + +end diff --git a/app/models/dmptemplate.rb b/app/models/dmptemplate.rb index 502a8b5..981b585 100644 --- a/app/models/dmptemplate.rb +++ b/app/models/dmptemplate.rb @@ -1,4 +1,6 @@ class Dmptemplate < ActiveRecord::Base + include GlobalHelpers + attr_accessible :id, :organisation_id, :description, :published, :title, :user_id, :locale, :is_default, :guidance_group_ids, :as => [:default, :admin] @@ -57,7 +59,7 @@ # # @return [Array] all templates from funder organisations def self.funders_templates - new_org_obejcts = OrganisationType.find_by(name: I18n.t("helpers.org_type.funder")).organisations + new_org_obejcts = OrganisationType.find_by(name: GlobalHelpers.constant("organisation_types.funder")).organisations org_templates = Array.new new_org_obejcts.each do |neworg| @@ -99,7 +101,7 @@ #verify if org type is not a funder current_org = Organisation.find(org_id) - if current_org.organisation_type.name != I18n.t("helpers.org_type.funder") then + if current_org.organisation_type.name != GlobalHelpers.constant("organisation_types.funder") then own_institutional_templates = self.own_institutional_templates(org_id) else own_institutional_templates = [] diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb index 36dd019..6d21897 100644 --- a/app/models/exported_plan.rb +++ b/app/models/exported_plan.rb @@ -1,11 +1,12 @@ class ExportedPlan < ActiveRecord::Base - + include GlobalHelpers + attr_accessible :plan_id, :user_id, :format, :as => [:default, :admin] #associations between tables belongs_to :plan belongs_to :user - + VALID_FORMATS = ['csv', 'html', 'json', 'pdf', 'text', 'xml', 'docx'] validates :format, inclusion: { in: VALID_FORMATS, message: I18n.t('helpers.plan.export.not_valid_format') } @@ -46,7 +47,7 @@ def funder org = self.plan.project.dmptemplate.try(:organisation) - org.name if org.present? && org.organisation_type.try(:name) == I18n.t('helpers.org_type.funder') + org.name if org.present? && org.organisation_type.try(:name) == constant("organisation_types.funder") end def institution @@ -107,7 +108,7 @@ output += "\n#{sanitize_text(answer.text)}\n" else output += "\n" - end + end end end end diff --git a/app/models/file_type.rb b/app/models/file_type.rb index 027055d..7c836dc 100644 --- a/app/models/file_type.rb +++ b/app/models/file_type.rb @@ -1,3 +1,3 @@ -class FileType < ActiveRecord::Base - #attr_accessible :name, :icon_location, :icon_name, :icon_size -end +class FileType < ActiveRecord::Base + #attr_accessible :name, :icon_location, :icon_name, :icon_size +end diff --git a/app/models/file_upload.rb b/app/models/file_upload.rb index 72bca44..7cf325c 100644 --- a/app/models/file_upload.rb +++ b/app/models/file_upload.rb @@ -1,7 +1,7 @@ -class FileUpload < ActiveRecord::Base - #attr_accessible :file_type_id, :description, :location, :name, :published, :size, :title - - #associations between tables - belongs_to :file_type - -end +class FileUpload < ActiveRecord::Base + #attr_accessible :file_type_id, :description, :location, :name, :published, :size, :title + + #associations between tables + belongs_to :file_type + +end diff --git a/app/models/guidance.rb b/app/models/guidance.rb index f537433..ac1e886 100644 --- a/app/models/guidance.rb +++ b/app/models/guidance.rb @@ -8,6 +8,7 @@ class Guidance < ActiveRecord::Base + include GlobalHelpers #associations between tables attr_accessible :text, :question_id, :published, :as => [:default, :admin] @@ -72,7 +73,7 @@ ## # Returns whether or not a given user can view a given guidance # we define guidances viewable to a user by those owned by a guidance group: - # owned by the DCC + # owned by the managing curation center # owned by a funder organisation # owned by an organisation, of which the user is a member # @@ -88,20 +89,19 @@ # guidances are viewable if they are owned by any of the user's organisations user.organisations.each do |organisation| - logger.debug "#{organisation.name}" if guidance_group.organisation.id == organisation.id viewable = true end end - # guidance groups are viewable if they are owned by the DCC - if guidance_group.organisation.id == Organisation.find_by( name: "Digital Curation Centre").id + # guidance groups are viewable if they are owned by the Managing Curation Center + if guidance_group.organisation.id == Organisation.find_by( name: GlobalHelpers.constant("organisation_types.managing_organisation")).id viewable = true end # guidance groups are viewable if they are owned by a funder - if guidance_group.organisation.organisation_type == OrganisationType.find_by( name: "Funder") + if guidance_group.organisation.organisation_type == OrganisationType.find_by( name: GlobalHelpers.constant("organisation_types.funder")) viewable = true end end @@ -112,17 +112,17 @@ ## # Returns a list of all guidances which a specified user can view # we define guidances viewable to a user by those owned by a guidance group: - # owned by the DCC + # owned by the Managing Curation Center # owned by a funder organisation # owned by an organisation, of which the user is a member # # @param user [User] a user object # @return [Array] a list of all "viewable" guidances to a user def self.all_viewable(user) - dcc_groups = (Organisation.find_by name: "Digital Curation Centre").guidance_groups + managing_groups = (Organisation.find_by name: GlobalHelpers.constant("organisation_types.managing_organisation")).guidance_groups # find all groups owned by a Funder organisation funder_groups = [] - funders = OrganisationType.find_by( name: "Funder") + funders = OrganisationType.find_by( name: GlobalHelpers.constant("organisation_types.funder")) funders.organisations.each do |funder| funder_groups += funder.guidance_groups end @@ -133,7 +133,7 @@ end # find all guidances belonging to any of the viewable groups all_viewable_guidances = [] - all_viewable_groups = dcc_groups + funder_groups + organisation_groups + all_viewable_groups = managing_groups + funder_groups + organisation_groups all_viewable_groups.each do |group| all_viewable_guidances += group.guidances end diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb index eb06b2a..201818c 100644 --- a/app/models/guidance_group.rb +++ b/app/models/guidance_group.rb @@ -1,4 +1,5 @@ class GuidanceGroup < ActiveRecord::Base + include GlobalHelpers #associations between tables belongs_to :organisation @@ -53,7 +54,7 @@ ## # Returns whether or not a given user can view a given guidance group # we define guidances viewable to a user by those owned by: - # the DCC + # the managing curation center # a funder organisation # an organisation, of which the user is a member # @@ -70,14 +71,14 @@ 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 + # groups are viewable if they are owned by the managing curation center + Organisation.where( name: GlobalHelpers.constant("organisation_types.managing_organisation")).find_each do |managing_group| + if guidance_group.organisation.id == managing_group.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") + if guidance_group.organisation.organisation_type == OrganisationType.find_by( name: GlobalHelpers.constant("organisation_types.funder")) viewable = true end @@ -87,27 +88,24 @@ ## # 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 + # the Managing Curation Center # 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" + # first find all groups owned by the Managing Curation Center + managing_org_groups = [] + Organisation.where( name: GlobalHelpers.constant("organisation_types.managing_organisation")).find_each do |managing_org| + managing_org_groups = managing_org_groups + managing_org.guidance_groups 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 = OrganisationType.find_by( name: GlobalHelpers.constant("organisation_types.funder")) 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 = [] @@ -115,9 +113,8 @@ 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 = managing_org_groups + funder_groups + organisation_groups all_viewable_groups = all_viewable_groups.uniq{|x| x.id} - logger.debug "we finished it?" return all_viewable_groups end end diff --git a/app/models/language.rb b/app/models/language.rb index a402b79..6566489 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -1,3 +1,3 @@ -class Language < ActiveRecord::Base - +class Language < ActiveRecord::Base + end \ No newline at end of file diff --git a/app/models/option.rb b/app/models/option.rb index 09aedaa..87dfc46 100644 --- a/app/models/option.rb +++ b/app/models/option.rb @@ -1,15 +1,15 @@ -class Option < ActiveRecord::Base - - #associations between tables - belongs_to :question - - 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}" - end +class Option < ActiveRecord::Base + + #associations between tables + belongs_to :question + + 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}" + end end \ No newline at end of file diff --git a/app/models/option_warning.rb b/app/models/option_warning.rb index 55067e6..d67709f 100644 --- a/app/models/option_warning.rb +++ b/app/models/option_warning.rb @@ -1,12 +1,12 @@ -class OptionWarning < ActiveRecord::Base - - #associations between tables - belongs_to :option - belongs_to :organisation - - attr_accessible :text, :option_id, :organisation_id, :as => [:default, :admin] - - def to_s - "#{text}" - end +class OptionWarning < ActiveRecord::Base + + #associations between tables + belongs_to :option + belongs_to :organisation + + attr_accessible :text, :option_id, :organisation_id, :as => [:default, :admin] + + def to_s + "#{text}" + end end \ No newline at end of file diff --git a/app/models/org_token_permission.rb b/app/models/org_token_permission.rb index fe49047..c00a248 100644 --- a/app/models/org_token_permission.rb +++ b/app/models/org_token_permission.rb @@ -1,8 +1,8 @@ -class OrgTokenPermission < ActiveRecord::Base - attr_accessible :organisation_id, :token_permission_type_id, :organisation, :token_permission_type, :as => [:default, :admin] - - #associations between tables - belongs_to :organisation - belongs_to :token_permission_type - -end +class OrgTokenPermission < ActiveRecord::Base + attr_accessible :organisation_id, :token_permission_type_id, :organisation, :token_permission_type, :as => [:default, :admin] + + #associations between tables + belongs_to :organisation + belongs_to :token_permission_type + +end diff --git a/app/models/organisation.rb b/app/models/organisation.rb index a1eef16..1da4a0b 100644 --- a/app/models/organisation.rb +++ b/app/models/organisation.rb @@ -1,4 +1,5 @@ class Organisation < ActiveRecord::Base + include GlobalHelpers #associations between tables belongs_to :organisation_type has_many :guidance_groups @@ -13,45 +14,78 @@ belongs_to :parent, :class_name => 'Organisation' + has_one :language + 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 - attr_accessible :abbreviation, :banner_text, :description, :domain, - :logo_file_name, :name, :stylesheet_file_id, :target_url, + 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 + :token_permission_type_ids, :language_id - def to_s - name - end - def short_name - if abbreviation.nil? then - return name - else - return abbreviation - end - end + ## + # returns the name of the organisation + # + # @return [String] + def to_s + name + 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 the abbreviation for the organisation if it exists, or the name if not + # + # @return [String] name or abbreviation of the organisation + def short_name + if abbreviation.nil? then + return name + else + return abbreviation + end + end + + ## + # finds all organisations who have a parent of the passed organisation type + # + # @params [String] the name of an organisation type + # @return [Array] + 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 = [GlobalHelpers.constant("organisation_types.funder")] + 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 guidance groups belonging to other organisations # # @return [Array] def self.other_organisations - org_types = [I18n.t('helpers.org_type.organisation')] + org_types = [GlobalHelpers.constant("organisation_types.funder")] organisations_list = [] org_types.each do |ot| new_org_obejct = OrganisationType.find_by_name(ot) diff --git a/app/models/organisation_type.rb b/app/models/organisation_type.rb index a1ce83d..c8e0edc 100644 --- a/app/models/organisation_type.rb +++ b/app/models/organisation_type.rb @@ -1,6 +1,6 @@ -class OrganisationType < ActiveRecord::Base - attr_accessible :description, :name, :as => [:default, :admin] - - has_many :organisations - -end +class OrganisationType < ActiveRecord::Base + attr_accessible :description, :name, :as => [:default, :admin] + + has_many :organisations + +end diff --git a/app/models/phase.rb b/app/models/phase.rb index b053f36..20cfb6f 100644 --- a/app/models/phase.rb +++ b/app/models/phase.rb @@ -1,6 +1,6 @@ # [+Project:+] DMPRoadmap # [+Description:+] This model describes informmation about the phase of a plan, it's title, order of display and which template it belongs to. -# +# # [+Created:+] 03/09/2014 # [+Copyright:+] Digital Curation Centre and University of California Curation Center class Phase < ActiveRecord::Base @@ -9,28 +9,41 @@ #associations between tables belongs_to :dmptemplate - + has_many :versions, :dependent => :destroy has_many :sections, :through => :versions, :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 - + attr_accessible :description, :number, :title, :dmptemplate_id, :as => [:default, :admin] - + friendly_id :title, use: [:slugged, :history, :finders] - + + ## + # returns the title of the phase + # + # @return [String] the title of the phase def to_s "#{title}" end - + + ## + # returns the most_recent version of this phase + # + # @return [Version] the most recent version of this phase def latest_version return versions.order("number DESC").last end - - #Verify if this phase has any published versions + + ## + # returns either the latest published version of this phase + # also serves to verify if this phase has any published versions as returns nil + # if there are no published versions + # + # @return [Version, nil] def latest_published_version versions.order("number DESC").each do |version| if version.published then @@ -39,8 +52,11 @@ end return nil end - - #verify if a phase has a published version or a version with one or more sections + + ## + # verify if a phase has a published version or a version with one or more sections + # + # @return [Boolean] def has_sections versions = self.versions.where('published = ?', true).order('updated_at DESC') if versions.any? then @@ -49,16 +65,15 @@ has_section = true else has_section = false - end + end else version = self.versions.order('updated_at DESC').first if !version.sections.empty? then has_section = true else has_section = false - end + end end return has_section - end - + end end diff --git a/app/models/plan.rb b/app/models/plan.rb index 65cdf1c..5946db3 100644 --- a/app/models/plan.rb +++ b/app/models/plan.rb @@ -24,36 +24,54 @@ alias_method :super_settings, :settings + ## # Proxy through to the template settings (or defaults if this plan doesn't have # an associated template) if there are no settings stored for this plan. # `key` is required by rails-settings, so it's required here, too. + # + # @param key [Key] a key required by rails + # @return [Settings] settings for this plan's template def settings(key) self_settings = self.super_settings(key) return self_settings if self_settings.value? - self.dmptemplate.settings(key) end + ## + # returns the template for this plan, or generates an empty template and returns that + # + # @return [Dmptemplate] the template associated with this plan def dmptemplate self.project.try(:dmptemplate) || Dmptemplate.new end + ## + # returns the title for this project as defined by the settings + # + # @return [String] the title for this project def title logger.debug "Title in settings: #{self.settings(:export).title}" if self.settings(:export).title == "" - if !self.version.nil? && !self.version.phase.nil? && !self.version.phase.title? then - return self.version.phase.title - else - return I18n.t('tool_title2') + if !self.version.nil? && !self.version.phase.nil? && !self.version.phase.title? then + return self.version.phase.title + else + return I18n.t('tool_title2') end else return self.settings(:export).title end end + ## + # returns the most recent answer to the given question id + # optionally can create an answer if none exists + # + # @param qid [Integer] the id for the question to find the answer for + # @param create_if_missing [Boolean] if true, will genereate a default answer to the question + # @return [Answer,nil] the most recent answer to the question, or a new question with default value, or nil def answer(qid, create_if_missing = true) - answer = answers.where(:question_id => qid).order("created_at DESC").first - question = Question.find(qid) + answer = answers.where(:question_id => qid).order("created_at DESC").first + question = Question.find(qid) if answer.nil? && create_if_missing then answer = Answer.new answer.plan_id = id @@ -70,6 +88,10 @@ return answer end + ## + # returns all of the sections for this version of the plan, and for the project's organisation + # + # @return [Array
      ,nil] either a list of sections, or nil if none were found def sections unless project.organisation.nil? then sections = version.global_sections + project.organisation.all_sections(version_id) @@ -79,6 +101,11 @@ return sections.uniq.sort_by &:number end + ## + # returns the guidances associated with the project's organisation, for a specified question + # + # @params question [Question] the question to find guidance for + # @return [Array] the list of guidances which pretain to the specified question def guidance_for_question(question) guidances = {} # If project org isn't nil, get guidance by theme from any "non-subset" groups belonging to project org @@ -93,7 +120,6 @@ end end end - # Get guidance by theme from any guidance groups selected on creation project.guidance_groups.each do |group| if group.dmptemplates.pluck(:id).include?(project.dmptemplate_id) || group.dmptemplates.count == 0 then @@ -102,23 +128,28 @@ guidances = self.add_guidance_to_array(guidances, group, theme, guidance) end end - end - end - + end + end # Get guidance by question where guidance group was selected on creation or if group is organisation default question.guidances.each do |guidance| guidance.guidance_groups.each do |group| if (group.organisation == project.organisation && !group.optional_subset) || project.guidance_groups.include?(group) then guidances = self.add_guidance_to_array(guidances, group, nil, guidance) end - end + end end - return guidances end + ## + # adds the given guidance to a hash indexed by a passed guidance group and theme + # + # @param guidance_array [{GuidanceGroup => {Theme => Array}}] the passed hash of arrays of guidances. Indexed by GuidanceGroup and Theme. + # @param guidance_group [GuidanceGroup] the guidance_group index of the hash + # @param theme [Theme] the theme object for the GuidanceGroup + # @param guidance [Guidance] the guidance object to be appended to the correct section of the array + # @return [{GuidanceGroup => {Theme => Array}}] the updated object which was passed in def add_guidance_to_array(guidance_array, guidance_group, theme, guidance) - if guidance_array[guidance_group].nil? then guidance_array[guidance_group] = {} end @@ -137,15 +168,14 @@ guidance_array[guidance_group][theme].push(guidance) end end - - return guidance_array + return guidance_array end - - - - - - + + ## + # finds the specified warning for the plan's project's organisation + # + # @param option_id [Integer] the id to find the OptionWarning associated + # @return [OptionWarning] the desired OptionWarning def warning(option_id) if project.organisation.nil? return nil @@ -154,10 +184,22 @@ end end + ## + # determines if the plan is editable by the specified user + # NOTE: This should be renamed to editable_by? + # + # @param user_id [Integer] the id for a user + # @return [Boolean] true if user can edit the plan def editable_by(user_id) return project.editable_by(user_id) end + ## + # determines if the plan is readable by the specified user + # NOTE: This shoudl be renamed to readable_by? + # + # @param user_id [Integer] the id for a user + # @return [Boolean] true if the user can read the plan def readable_by(user_id) if project.nil? return false @@ -166,10 +208,24 @@ end end + ## + # determines if the plan is administerable by the specified user + # NOTE: This should be renamed to administerable_by? + # + # @param user_id [Integer] the id for the user + # @return [Boolean] true if the user can administer the plan def administerable_by(user_id) return project.readable_by(user_id) end + + ## + # defines and returns the status of the plan + # status consists of a hash of the num_questions, num_answers, sections, questions, and spaced used. + # For each section, it contains theid's of each of the questions + # for each question, it contains the answer_id, answer_created_by, answer_text, answer_options_id, aand answered_by + # + # @return [Status] def status status = { "num_questions" => 0, @@ -228,6 +284,13 @@ return status end + + ## + # defines and returns the details for the plan + # details consists of a hash of: project_title, phase_title, and for each section, + # section: title, question text for each question, answer type and answer value + # + # @return [Details] def details details = { "project_title" => project.title, @@ -258,6 +321,12 @@ return details end + ## + # determines wether or not a specified section of a plan is locked to a specified user and returns a status hash + # + # @param section_id [Integer] the setion to determine if locked + # @param user_id [Integer] the user to determine if locked for + # @return [Hash{String => Hash{String => Boolean, nil, String, Integer}}] def locked(section_id, user_id) plan_section = plan_sections.where("section_id = ? AND user_id != ? AND release_time > ?", section_id, user_id, Time.now).last if plan_section.nil? then @@ -277,24 +346,44 @@ end end + ## + # for each section, lock the section with the given user_id + # + # @param user_id [Integer] the id for the user who can use the sections def lock_all_sections(user_id) sections.each do |s| lock_section(s.id, user_id, 1800) end end + ## + # for each section, unlock the section + # + # @param user_id [Integer] the id for the user to unlock the sections for def unlock_all_sections(user_id) plan_sections.where(:user_id => user_id).order("created_at DESC").each do |lock| lock.delete end end + ## + # for each section, unlock the section + # Not sure how this is different from unlock_all_sections + # + # @param user_id [Integer] def delete_recent_locks(user_id) plan_sections.where(:user_id => user_id).each do |lock| lock.delete end end + ## + # Locks the specified section to only be used by the specified user, for the number of secconds specified + # + # @param section_id [Integer] the id of the section to be locked + # @param user_id [Integer] the id of the user who can use the section + # @param release_time [Integer] the number of secconds the section will be locked for, defaults to 60 + # @return [Boolean] wether or not the section was locked def lock_section(section_id, user_id, release_time = 60) status = locked(section_id, user_id) if ! status["locked"] then @@ -313,12 +402,22 @@ end end + ## + # unlocks the specified section for the specified user + # + # @param section_id [Integer] the id for the section to be unlocked + # @param user_id [Integer] the id for the user for whom the section was previously locked + # @return [Boolean] wether or not the lock was removed def unlock_section(section_id, user_id) plan_sections.where(:section_id => section_id, :user_id => user_id).order("created_at DESC").each do |lock| lock.delete end end + ## + # returns the time of either the latest answer to any question, or the latest update to the model + # + # @return [DateTime] the time at which the plan was last changed def latest_update if answers.any? then last_answered = answers.order("updated_at DESC").first.updated_at @@ -332,6 +431,12 @@ end end + ## + # returns an array of hashes. Each hash contains the question's id, the answer_id, + # the answer_text, the answer_timestamp, and the answer_options + # + # @params section_id [Integer] the section to find answers of + # @return [Array nil,String,Integer,DateTime}] def section_answers(section_id) section = Section.find(section_id) section_questions = Array.new @@ -363,6 +468,7 @@ private + ## # Based on the height of the text gathered so far and the available vertical # space of the pdf, estimate a percentage of how much space has been used. # This is highly dependent on the layout in the pdf. A more accurate approach @@ -370,6 +476,9 @@ # could be very slow. # NOTE: This is only an estimate, rounded up to the nearest 5%; it is intended # for guidance when editing plan data, not to be 100% accurate. + # + # @params used_height [Integer] an estimate of the height used so far + # @return [Integer] the estimate of space used of an A4 portrain def estimate_space_used(used_height) @formatting ||= self.settings(:export).formatting @@ -383,6 +492,7 @@ (percentage / ROUNDING).ceil * ROUNDING # round up to nearest five end + ## # Take a guess at the vertical height (in mm) of the given text based on the # font-size and left/right margins stored in the plan's settings. # This assumes a fixed-width for each glyph, which is obviously @@ -390,6 +500,10 @@ # they'll hopefully average out to that in the long-run. # Allows for hinting different font sizes (offset from base via font_size_inc) # and vertical margins (i.e. for heading text) + # + # @params text [String] the text to estimate size of + # @params font_size_inc [Integer] the size of the font of the text, defaults to 0 + # @params vertical_margin [Integer] the top margin above the text, defaults to 0 def height_of_text(text, font_size_inc = 0, vertical_margin = 0) @formatting ||= self.settings(:export).formatting @margin_width ||= @formatting[:margin][:left].to_i + @formatting[:margin][:right].to_i diff --git a/app/models/plan_section.rb b/app/models/plan_section.rb index 1029b88..6a92a74 100644 --- a/app/models/plan_section.rb +++ b/app/models/plan_section.rb @@ -1,9 +1,9 @@ -class PlanSection < ActiveRecord::Base - attr_accessible :plan_id, :release_time, :section_id, :user_id, :as => [:default, :admin] - - #associations between tables - belongs_to :section - belongs_to :plan - belongs_to :user - -end +class PlanSection < ActiveRecord::Base + attr_accessible :plan_id, :release_time, :section_id, :user_id, :as => [:default, :admin] + + #associations between tables + belongs_to :section + belongs_to :plan + belongs_to :user + +end diff --git a/app/models/project.rb b/app/models/project.rb index 14aa4ba..4c14724 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,4 +1,5 @@ class Project < ActiveRecord::Base + include GlobalHelpers extend FriendlyId @@ -16,46 +17,67 @@ friendly_id :title, use: [:slugged, :history, :finders] + ## + # returns the title of the project + # + # @return [String] the project's title def to_s "#{title}" end - + after_create :create_plans + ## + # sets a new funder for the project + # defaults to the first dmptemplate if the current template is nill and the funder has more than one dmptemplate + # + # @param new_funder_id [Integer] the id for a new funder + # @return [Organisation] the new funder def funder_id=(new_funder_id) if new_funder_id != "" then new_funder = Organisation.find(new_funder_id); - if new_funder.dmptemplates.count >= 1 && self.dmptemplate.nil? then self.dmptemplate = new_funder.dmptemplates.first end end end + ## + # returns the funder id for the project + # + # @return [Integer, nil] the id for the funder def funder_id if self.dmptemplate.nil? then return nil end template_org = self.dmptemplate.organisation - if template_org.organisation_type.name == I18n.t('helpers.org_type.funder').downcase + if template_org.organisation_type.name == constant("organisation_types.funder").downcase return template_org.id else return nil end end + ## + # returns the funder organisation for the project or nil if none is specified + # + # @return [Organisation, nil] the funder for project, or nil if none exists def funder if self.dmptemplate.nil? then return nil end template_org = self.dmptemplate.organisation - if template_org.organisation_type.name == I18n.t('helpers.org_type.funder').downcase + if template_org.organisation_type.name == constant("organisation_types.funder").downcase return template_org else return nil end end + ## + # returns the name of the funder for the project + # + # @return [String] the name fo the funder for the project def funder_name if self.funder.nil? return read_attribute(:funder_name) @@ -64,6 +86,11 @@ end end + ## + # defines a new funder_name for the project. + # + # @param new_funder_name [String] the string name of the new funder + # @return [Integer, nil] the org_id of the new funder def funder_name=(new_funder_name) write_attribute(:funder_name, new_funder_name) org_table = Organisation.arel_table @@ -76,12 +103,21 @@ end end + ## + # sets a new institution_id if there is no current organisation + # + # @params new_institution_id [Integer] the id for the new institution + # @return [Integer, Bool] false if an organisation exists, or the id of the set org if a new organisation is set def institution_id=(new_institution_id) if organisation.nil? then self.organisation_id = new_institution_id end end + ## + # returns the organisation which is root over the owning organisation + # + # @return [Integer, nil] the organisation_id or nil def institution_id if organisation.nil? return nil @@ -90,12 +126,23 @@ end end + ## + # defines a new organisation_id for the project + # but is confusingly labled unit_id + # + # @params new_unit_id [Integer] + # @return [Integer, Boolean] the new organisation ID or false if no unit_id was passed def unit_id=(new_unit_id) unless new_unit_id.nil? ||new_unit_id == "" self.organisation_id = new_unit_id end end + ## + # returns the organisation_id or nil + # again seems redundant + # + # @return [nil, Integer] nil if no organisation, or the id if there is an organisation specified def unit_id if organisation.nil? || organisation.parent_id.nil? return nil @@ -104,22 +151,47 @@ end end + ## + # assigns the passed user_id to the creater_role for the project + # gives the user rights to read, edit, administrate, and defines them as creator + # + # @param user_id [Integer] the user to be given priveleges' id def assign_creator(user_id) add_user(user_id, true, true, true) end + ## + # assigns the passed user_id as an editor for the project + # gives the user rights to read and edit + # + # @param user_id [Integer] the user to be given priveleges' id def assign_editor(user_id) add_user(user_id, true) end + ## + # assigns the passed user_id as a reader for the project + # gives the user rights to read + # + # @param user_id [Integer] the user to be given priveleges' id def assign_reader(user_id) add_user(user_id) end + ## + # assigns the passed user_id as an administrator for the project + # gives the user rights to read, adit, and administrate the project + # + # @param user_id [Integer] the user to be given priveleges' id def assign_administrator(user_id) add_user(user_id, true, true) end + ## + # whether or not the current plan is administrable by the user + # + # @param user_id [Integer] the user to check if has privleges + # @return [Boolean] true if user can administer project, false otherwise def administerable_by(user_id) user = project_groups.find_by_user_id(user_id) if (! user.nil?) && user.project_administrator then @@ -129,6 +201,11 @@ end end + ## + # whether or not the current plan is editable by the user + # + # @param user_id [Integer] the user to check if has privleges + # @return [Boolean] true if user can edit project, false otherwise def editable_by(user_id) user = project_groups.find_by_user_id(user_id) if (! user.nil?) && user.project_editor then @@ -138,6 +215,12 @@ end end + ## + # whether or not the current plan is readable by the user + # should be renamed to readable_by? + # + # @param user_id [Integer] the user to check if has privleges + # @return [Boolean] true if user can read project, false otherwise def readable_by(user_id) user = project_groups.find_by_user_id(user_id) if (! user.nil?) then @@ -147,6 +230,11 @@ end end + ## + # returns the projects which the user can atleast read + # + # @param user_id [Integer] the user to lookup projects for + # @return [Array] list of all projects the user can atleast read def self.projects_for_user(user_id) projects = Array.new groups = ProjectGroup.where("user_id = ?", user_id) @@ -160,6 +248,12 @@ return projects end + ## + # whether or not the specified user_id created this project + # should be renamed to created_by? + # + # @params user_id [Integer] the user to check the priveleges of + # @return [Boolean] true if the user created the project def created_by(user_id) user = project_groups.find_by_user_id(user_id) if (! user.nil?) && user.project_creator then @@ -169,6 +263,10 @@ end end + ## + # the datetime for the latest update of this project, or any plan it owns + # + # @return [DateTime] the time of latest update def latest_update latest_update = updated_at plans.each do |plan| @@ -180,30 +278,60 @@ end # Getters to match 'My plans' columns + + ## + # the title of the project + # + # @return [String] the title of the project def name self.title end + ## + # the owner of the project + # + # @return [User] the creater of the project def owner self.project_groups.find_by_project_creator(true).try(:user) end + ## + # the time the project was last updated, formatted as a date + # + # @return [Date] last update as a date def last_edited self.latest_update.to_date end + ## + # whether or not the plan is shared with anybody + # + # @return [Boolean] true if the project has been shared def shared? self.project_groups.count > 1 end alias_method :shared, :shared? + ## + # the organisation who owns the project + # + # @return [Dmptemplate,Organisation,String] the template, it's owner, or it's owner's abreviation def template_owner self.dmptemplate.try(:organisation).try(:abbreviation) end private + ## + # adds a user to the project + # if no flags are specified, the user is given read privleges + # + # @param user_id [Integer] the user to be given privleges + # @param is_editor [Boolean] whether or not the user can edit the project + # @param is_administrator [Boolean] whether or not the user can administrate the project + # @param is_creator [Boolean] wheter or not the user created the project + # @return [Array] def add_user(user_id, is_editor = false, is_administrator = false, is_creator = false) group = ProjectGroup.new group.user_id = user_id @@ -213,6 +341,11 @@ project_groups << group end + ## + # creates a plan for each phase in the dmptemplate associated with this project + # unless the phase is unpublished, it creates a new plan, and a new version of the plan and adds them to the project's plans + # + # @return [Array] def create_plans dmptemplate.phases.each do |phase| latest_published_version = phase.latest_published_version diff --git a/app/models/project_group.rb b/app/models/project_group.rb index a3be229..05a4c1e 100644 --- a/app/models/project_group.rb +++ b/app/models/project_group.rb @@ -1,44 +1,66 @@ class ProjectGroup < ActiveRecord::Base - #associations between tables - belongs_to :project - belongs_to :user - - attr_accessible :project_creator, :project_editor, :project_administrator, :project_id, :user_id, :email, :access_level, :as => [:default, :admin] - - def email - unless user.nil? - return user.email - end - end - - def email=(new_email) - unless User.find_by_email(email).nil? then - user = User.find_by_email(email) + #associations between tables + belongs_to :project + belongs_to :user + + attr_accessible :project_creator, :project_editor, :project_administrator, :project_id, :user_id, :email, :access_level, :as => [:default, :admin] + + ## + # returns the user's email unless it is nil + # + # @return [Boolean, String] false if no email exists, the email otherwise + def email + unless user.nil? + return user.email end - end - - def access_level - if project_administrator then - return 3 - elsif project_editor then - return 2 - else - return 1 - end - end - - def access_level=(new_access_level) - new_access_level = new_access_level.to_i - if new_access_level >= 3 then - project_administrator = true - else - project_administrator = false - end - if new_access_level >= 2 then - project_editor = true - else - project_editor = false - end - end + end + + ## + # define a new user for the project group by email + # + # @param new_email [String] the email of the new user for the project group + # @return [User] the new user + def email=(new_email) + unless User.find_by(email: email).nil? then + user = User.find_by(email: email) + end + end + + ## + # return the access level for the current project group + # 3 if the user is an administrator + # 2 if the user is an editor + # 1 if the user can only read + # + # @return [Integer] + def access_level + if project_administrator then + return 3 + elsif project_editor then + return 2 + else + return 1 + end + end + + ## + # define a new access level for the current project group + # if >=3, the user is a project administrator + # if >=2, the user is an editor + # + # @param new_access_level [Integer] the access level to give the user + def access_level=(new_access_level) + new_access_level = new_access_level.to_i + if new_access_level >= 3 then + project_administrator = true + else + project_administrator = false + end + if new_access_level >= 2 then + project_editor = true + else + project_editor = false + end + end end diff --git a/app/models/project_partner.rb b/app/models/project_partner.rb index 93d4a41..3c82e18 100644 --- a/app/models/project_partner.rb +++ b/app/models/project_partner.rb @@ -1,3 +1,3 @@ -class ProjectPartner < ActiveRecord::Base - attr_accessible :leader_org, :organisation_id, :project_id, :as => [:default, :admin] -end +class ProjectPartner < ActiveRecord::Base + attr_accessible :leader_org, :organisation_id, :project_id, :as => [:default, :admin] +end diff --git a/app/models/question.rb b/app/models/question.rb index 6a46f07..4cce243 100644 --- a/app/models/question.rb +++ b/app/models/question.rb @@ -20,20 +20,21 @@ accepts_nested_attributes_for :suggested_answers, :allow_destroy => true accepts_nested_attributes_for :themes - 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] + 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] + ## + # returns the text from the question + # + # @return [String] question's text def to_s - "#{text}" - end + "#{text}" + end - amoeba do - include_association :options - include_association :suggested_answers - clone [:themes] - end + amoeba do + include_association :options + include_association :suggested_answers + clone [:themes] + end #def question_type? # type_label = {} @@ -47,6 +48,11 @@ # return type_label #end + ## + # for each question theme, appends them separated by comas + # shouldnt have a ? after the method name + # + # @return [Hash{String=> String}] def question_themes? themes_label = {} i = 1 @@ -64,7 +70,12 @@ return themes_label end + ## # guidance for question in the org admin + # + # @param question [Question] the question to find guidance for + # @param org_admin [Organisation] the organisation to find guidance for + # @return [Hash{String => String}] def guidance_for_question(question, org_admin) # pulls together guidance from various sources for question guidances = {} @@ -77,7 +88,6 @@ end end end - # Guidance link to directly to a question question.guidances.each do |g_by_q| g_by_q.guidance_groups.each do |group| @@ -86,20 +96,17 @@ end end end - return guidances end - - - - - #get suggested answer belonging to the currents user for this question + ## + # get suggested answer belonging to the currents user for this question + # + # @param org_id [Integer] the id for the organisation + # @return [String] the suggested_answer for this question for the specified organisation def get_suggested_answer(org_id) suggested_answer = suggested_answers.find_by_organisation_id(org_id) return suggested_answer end - - end diff --git a/app/models/question_format.rb b/app/models/question_format.rb index e72a014..b8ede7c 100644 --- a/app/models/question_format.rb +++ b/app/models/question_format.rb @@ -1,12 +1,14 @@ class QuestionFormat < ActiveRecord::Base attr_accessible :title, :description, :as => [:default, :admin] - + #associations between tables has_many :questions - - def to_s + ## + # gives the title of the question_format + # + # @return [String] title of the question_format + def to_s "#{title}" end - - + end \ No newline at end of file diff --git a/app/models/region.rb b/app/models/region.rb new file mode 100644 index 0000000..8147fed --- /dev/null +++ b/app/models/region.rb @@ -0,0 +1,3 @@ +class Region < ActiveRecord::Base + +end \ No newline at end of file diff --git a/app/models/region_group.rb b/app/models/region_group.rb new file mode 100644 index 0000000..8f83a83 --- /dev/null +++ b/app/models/region_group.rb @@ -0,0 +1,3 @@ +class RegionGroup < ActiveRecord::Base + +end \ No newline at end of file diff --git a/app/models/role.rb b/app/models/role.rb index 1907a40..c568dac 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,9 +1,9 @@ -class Role < ActiveRecord::Base - has_and_belongs_to_many :users, :join_table => :users_roles - - belongs_to :resource, :polymorphic => true - - scopify - attr_accessible :name, :role_in_plans, :resource_id, :resource_type, :as => [:default, :admin] - -end +class Role < ActiveRecord::Base + has_and_belongs_to_many :users, :join_table => :users_roles + + belongs_to :resource, :polymorphic => true + + scopify + attr_accessible :name, :role_in_plans, :resource_id, :resource_type, :as => [:default, :admin] + +end diff --git a/app/models/section.rb b/app/models/section.rb index 223e350..fd1dcb7 100644 --- a/app/models/section.rb +++ b/app/models/section.rb @@ -12,6 +12,10 @@ attr_accessible :organisation_id, :description, :number, :title, :version_id , :published, :questions_attributes, :as => [:default, :admin] + ## + # return the title of the section + # + # @return [String] the title of the section def to_s "#{title}" end diff --git a/app/models/settings/dmptemplate.rb b/app/models/settings/dmptemplate.rb index 65cff2a..a5ce2de 100644 --- a/app/models/settings/dmptemplate.rb +++ b/app/models/settings/dmptemplate.rb @@ -1,93 +1,93 @@ -module Settings - class Dmptemplate < RailsSettings::SettingObject - - #attr_accessible :var, :target, :target_id, :target_type - - VALID_FONT_FACES = [ - 'Arial, Helvetica, Sans-Serif', - '"Times New Roman", Times, Serif' - ] - - VALID_FONT_SIZE_RANGE = (8..14) - VALID_MARGIN_RANGE = (5..25) - - VALID_ADMIN_FIELDS = ['project_name', 'project_identifier', 'grant_title', 'principal_investigator', - 'project_data_contact', 'project_description', 'funder', 'institution'] - - DEFAULT_SETTINGS = { - formatting: { - margin: { # in millimeters - top: 20, - bottom: 20, - left: 20, - right: 20 - }, - font_face: VALID_FONT_FACES.first, - font_size: 12 # pt - }, - max_pages: 3, - fields: { - admin: VALID_ADMIN_FIELDS, - questions: :all - }, - title: "" - } - - validate do - formatting = value['formatting'] - max_pages = value['max_pages'] - fields = value['fields'] - - if formatting.present? - errs = [] - default_formatting = DEFAULT_SETTINGS[:formatting] - - unless (default_formatting.keys - formatting.keys).empty? - errs << :missing_key - else - unless formatting[:margin].is_a?(Hash) - errs << :invalid_margin - else - errs << :negative_margin if formatting[:margin].any? {|k,v| v.to_i < 0 } - errs << :unknown_margin unless (formatting[:margin].keys - default_formatting[:margin].keys).empty? - errs << :invalid_margin unless formatting[:margin].all? {|k,v| VALID_MARGIN_RANGE.member?(v) } - end - - errs << :invalid_font_size unless VALID_FONT_SIZE_RANGE.member?(formatting[:font_size]) - errs << :invalid_font_face unless VALID_FONT_FACES.member?(formatting[:font_face]) - errs << :unknown_key unless (formatting.keys - default_formatting.keys).empty? - end - - errs.map do |key| - errors.add(:formatting, I18n.t("helpers.settings.plans.errors.#{key}")) - end - - end - - if max_pages.present? && (!max_pages.is_a?(Integer) || max_pages <= 0) - errors.add(:max_pages, I18n.t('helpers.settings.plans.errors.invalid_max_pages')) - end - end - - before_validation do - self.formatting[:font_size] = self.formatting[:font_size].to_i if self.formatting[:font_size].present? - unless self.formatting[:margin].nil? or (not self.formatting[:margin].is_a?(Hash)) - self.formatting[:margin].each do |key, val| - self.formatting[:margin][key] = val.to_i - end - end - - self.fields.each do |key, val| - if val.is_a?(Hash) - val = key == :questions ? val.keys.map {|k| k.to_s.to_i } : val.keys - end - - self.fields[key] = val - end - - # Save empty arrays if we don't have any fields for them - self.fields[:admin] ||= [] - self.fields[:questions] ||= [] - end - end -end +module Settings + class Dmptemplate < RailsSettings::SettingObject + + #attr_accessible :var, :target, :target_id, :target_type + + VALID_FONT_FACES = [ + 'Arial, Helvetica, Sans-Serif', + '"Times New Roman", Times, Serif' + ] + + VALID_FONT_SIZE_RANGE = (8..14) + VALID_MARGIN_RANGE = (5..25) + + VALID_ADMIN_FIELDS = ['project_name', 'project_identifier', 'grant_title', 'principal_investigator', + 'project_data_contact', 'project_description', 'funder', 'institution'] + + DEFAULT_SETTINGS = { + formatting: { + margin: { # in millimeters + top: 20, + bottom: 20, + left: 20, + right: 20 + }, + font_face: VALID_FONT_FACES.first, + font_size: 12 # pt + }, + max_pages: 3, + fields: { + admin: VALID_ADMIN_FIELDS, + questions: :all + }, + title: "" + } + + validate do + formatting = value['formatting'] + max_pages = value['max_pages'] + fields = value['fields'] + + if formatting.present? + errs = [] + default_formatting = DEFAULT_SETTINGS[:formatting] + + unless (default_formatting.keys - formatting.keys).empty? + errs << :missing_key + else + unless formatting[:margin].is_a?(Hash) + errs << :invalid_margin + else + errs << :negative_margin if formatting[:margin].any? {|k,v| v.to_i < 0 } + errs << :unknown_margin unless (formatting[:margin].keys - default_formatting[:margin].keys).empty? + errs << :invalid_margin unless formatting[:margin].all? {|k,v| VALID_MARGIN_RANGE.member?(v) } + end + + errs << :invalid_font_size unless VALID_FONT_SIZE_RANGE.member?(formatting[:font_size]) + errs << :invalid_font_face unless VALID_FONT_FACES.member?(formatting[:font_face]) + errs << :unknown_key unless (formatting.keys - default_formatting.keys).empty? + end + + errs.map do |key| + errors.add(:formatting, I18n.t("helpers.settings.plans.errors.#{key}")) + end + + end + + if max_pages.present? && (!max_pages.is_a?(Integer) || max_pages <= 0) + errors.add(:max_pages, I18n.t('helpers.settings.plans.errors.invalid_max_pages')) + end + end + + before_validation do + self.formatting[:font_size] = self.formatting[:font_size].to_i if self.formatting[:font_size].present? + unless self.formatting[:margin].nil? or (not self.formatting[:margin].is_a?(Hash)) + self.formatting[:margin].each do |key, val| + self.formatting[:margin][key] = val.to_i + end + end + + self.fields.each do |key, val| + if val.is_a?(Hash) + val = key == :questions ? val.keys.map {|k| k.to_s.to_i } : val.keys + end + + self.fields[key] = val + end + + # Save empty arrays if we don't have any fields for them + self.fields[:admin] ||= [] + self.fields[:questions] ||= [] + end + end +end diff --git a/app/models/settings/plan_list.rb b/app/models/settings/plan_list.rb index f046cfd..17e93a9 100644 --- a/app/models/settings/plan_list.rb +++ b/app/models/settings/plan_list.rb @@ -1,21 +1,21 @@ -module Settings - class PlanList < RailsSettings::SettingObject - - #attr_accessible :var, :target, :target_type, :target_id - - # TODO: can these be taken from somewhere else rather than hard-coded here? - 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.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 -end +module Settings + class PlanList < RailsSettings::SettingObject + + #attr_accessible :var, :target, :target_type, :target_id + + # TODO: can these be taken from somewhere else rather than hard-coded here? + 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.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 +end diff --git a/app/models/splash_log.rb b/app/models/splash_log.rb index 6b10901..43dcc4d 100644 --- a/app/models/splash_log.rb +++ b/app/models/splash_log.rb @@ -1,3 +1,3 @@ -class SplashLog < ActiveRecord::Base - #attr_accessible :destination -end +class SplashLog < ActiveRecord::Base + #attr_accessible :destination +end diff --git a/app/models/suggested_answer.rb b/app/models/suggested_answer.rb index 01d233e..3bbefa8 100644 --- a/app/models/suggested_answer.rb +++ b/app/models/suggested_answer.rb @@ -2,12 +2,15 @@ belongs_to :organisation belongs_to :question - + # accepts_nested_attributes_for :question - + attr_accessible :organisation_id, :question_id, :text, :is_example, :as => [:default, :admin] - - + + ## + # returns the text from the suggested_answer + # + # @return [String] the text from the suggested_answer def to_s "#{text}" end diff --git a/app/models/theme.rb b/app/models/theme.rb index 70b5b11..0b31f36 100644 --- a/app/models/theme.rb +++ b/app/models/theme.rb @@ -1,19 +1,23 @@ class Theme < ActiveRecord::Base #associations between tables - has_and_belongs_to_many :questions, join_table: "questions_themes" + has_and_belongs_to_many :questions, join_table: "questions_themes" has_and_belongs_to_many :guidances, join_table: "themes_in_guidance" - - + + # accepts_nested_attributes_for :guidances # accepts_nested_attributes_for :questions - + attr_accessible :guidance_ids , :as => [:default, :admin] attr_accessible :question_ids, :as => [:default, :admin] attr_accessible :description, :title, :locale , :as => [:default, :admin] - + + ## + # returns the title of the theme + # + # @return [String] title of the theme def to_s title end - + end diff --git a/app/models/token_permission_type.rb b/app/models/token_permission_type.rb index 8c02ecb..9b340f1 100644 --- a/app/models/token_permission_type.rb +++ b/app/models/token_permission_type.rb @@ -5,6 +5,10 @@ #associations between tables has_and_belongs_to_many :org_token_permissions, join_table: "org_token_permissions" + ## + # returns the token_type of the token_permission_type + # + # @return [String] token_type of the token_permission_type def to_s self.token_type end diff --git a/app/models/user.rb b/app/models/user.rb index 2c0064b..e9ea489 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,9 +1,11 @@ class User < ActiveRecord::Base + include GlobalHelpers + rolify # Include default devise modules. Others available are: # :token_authenticatable, :confirmable, # :lockable, :timeoutable and :omniauthable - devise :invitable, :database_authenticatable, :registerable, :recoverable, :rememberable, + devise :invitable, :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable, :omniauth_providers => [:shibboleth] #associations between tables @@ -14,6 +16,7 @@ has_many :project_groups, :dependent => :destroy has_many :organisations , through: :user_org_roles has_many :user_role_types, through: :user_org_roles + has_one :language @@ -39,15 +42,15 @@ # 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 :password_confirmation, :encrypted_password, :remember_me, :id, :email, + 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 + :other_organisation, :accept_terms, :role_ids, :dmponline3, :api_token, + :language_id # 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. @@ -55,6 +58,11 @@ s.key :plan_list, defaults: { columns: Settings::PlanList::DEFAULT_COLUMNS } end + ## + # gives either the name of the user, or the email if name unspecified + # + # @param user_email [Boolean] defaults to true, allows the use of email if there is no firstname or surname + # @return [String] the email or the firstname and surname of the user def name(use_email = true) if ((firstname.nil? && surname.nil?) || (firstname.strip == "" && surname.strip == "")) && use_email then return email @@ -64,6 +72,13 @@ end end + ## + # sets a new organisation id for the user + # if the user has any roles such as org_admin or admin, those are removed + # if the user had an api_token, that is removed + # + # @param new_organisation_id [Integer] the id for an organisation + # @return [String] the empty string as a causality of setting api_token def organisation_id=(new_organisation_id) # if the user is not part of the new organisation if !self.user_org_roles.pluck(:organisation_id).include?(new_organisation_id.to_i) then @@ -71,7 +86,7 @@ if self.user_org_roles.count != 1 then new_user_org_role = UserOrgRole.new new_user_org_role.organisation_id = new_organisation_id - new_user_org_role.user_role_type = UserRoleType.find_by_name("user"); + new_user_org_role.user_role_type = UserRoleType.find_by(name: constant("user_role_types.user")); self.user_org_roles << new_user_org_role # # if the user has roles other than one(0/2/3?) @@ -83,7 +98,7 @@ # save modified role user_org_role.save # if user has an "org_admin" role - org_admin_role = roles.find_by_name("org_admin") + org_admin_role = roles.find_by(name: constant("user_role_types.org_admin")) unless org_admin_role.nil? then # delete it roles.delete(org_admin_role) @@ -91,9 +106,13 @@ end end # rip api_token from user - self.api_token = "" + self.remove_token! end + ## + # returns the first organisation id of the user or nil + # + # @return [Integer, nil] the id of the user's organisation def organisation_id if self.organisations.count > 0 then return self.organisations.first.id @@ -102,6 +121,10 @@ end end + ## + # returns the organisation of the user or nil + # + # @return [Organisation, nil] the organisation of the user def organisation if self.organisations.count > 0 then return self.organisations.first @@ -110,6 +133,11 @@ end end + ## + # returns the last organisation in the list of organisations + # possibly depricated as the user only has one organisation in the current schema + # + # @return [Organisation, nil] the organisation for the user def current_organisation if self.organisations.count > 0 then return self.organisations.last @@ -118,42 +146,64 @@ end end + ## + # sets a new organisation for the user + # + # @params new_organisation [Organisation] the new organisation for the user def organisation=(new_organisation) organisation_id = organisation.id end + ## + # checks if the user is an admin + # + # @return [Boolean] true if the user is an admin def is_admin? - admin = roles.find_by_name("admin") + admin = roles.find_by( name: constant("user_role_types.super_admin")) return !admin.nil? end + ## + # checks if the user is an organisation admin + # + # @return [Boolean] true if the user is an organisation admin def is_org_admin? - org_admin = roles.find_by_name("org_admin") + org_admin = roles.find_by(name: constant("user_role_types.organisational_admin")) return !org_admin.nil? end - def org_type - org_type = organisation.organisation_type.name - return org_type - end + ## + # checks what type the user's organisation is + # + # @return [String] the organisation type + def org_type + org_type = organisation.organisation_type.name + return org_type + end - def remove_token! - unless api_token.empty? - self.api_token = "" - self.save! - end + ## + # removes the api_token from the user + # modifies the user model + def remove_token! + unless api_token.empty? + self.api_token = "" + self.save! end + end - def keep_or_generate_token! - if api_token.empty? - self.api_token = loop do - random_token = SecureRandom.urlsafe_base64(nil, false) - break random_token unless User.exists?(api_token: random_token) - end - self.save! - # send an email to the user to notify them of their new api token - UserMailer.api_token_granted_notification(self) - end + # + # generates a new token for the user unless the user already has a token. + # modifies the user's model. + def keep_or_generate_token! + if api_token.empty? + self.api_token = loop do + random_token = SecureRandom.urlsafe_base64(nil, false) + break random_token unless User.exists?(api_token: random_token) + end + self.save! + # send an email to the user to notify them of their new api token + UserMailer.api_token_granted_notification(self) end + end end diff --git a/app/models/user_org_role.rb b/app/models/user_org_role.rb index 7d94d6f..10fca3c 100644 --- a/app/models/user_org_role.rb +++ b/app/models/user_org_role.rb @@ -1,9 +1,9 @@ -class UserOrgRole < ActiveRecord::Base - attr_accessible :organisation_id, :user_id, :user_role_type_id, :as => [:default, :admin] - - #associations between tables - belongs_to :user - belongs_to :organisation - belongs_to :user_role_type - -end +class UserOrgRole < ActiveRecord::Base + attr_accessible :organisation_id, :user_id, :user_role_type_id, :as => [:default, :admin] + + #associations between tables + belongs_to :user + belongs_to :organisation + belongs_to :user_role_type + +end diff --git a/app/models/user_role_type.rb b/app/models/user_role_type.rb index 756f032..e012aca 100644 --- a/app/models/user_role_type.rb +++ b/app/models/user_role_type.rb @@ -1,7 +1,7 @@ -class UserRoleType < ActiveRecord::Base - - #associations between tables - has_many :user_org_roles - - attr_accessible :description, :name, :as => [:default, :admin] -end +class UserRoleType < ActiveRecord::Base + + #associations between tables + has_many :user_org_roles + + attr_accessible :description, :name, :as => [:default, :admin] +end diff --git a/app/models/user_status.rb b/app/models/user_status.rb index 5c7bea6..a8c4dcd 100644 --- a/app/models/user_status.rb +++ b/app/models/user_status.rb @@ -1,6 +1,6 @@ -class UserStatus < ActiveRecord::Base - attr_accessible :description, :name, :as => [:default, :admin] - - #associations between tables - has_many :users -end +class UserStatus < ActiveRecord::Base + attr_accessible :description, :name, :as => [:default, :admin] + + #associations between tables + has_many :users +end diff --git a/app/models/user_type.rb b/app/models/user_type.rb index 8cf20be..8ceb4d4 100644 --- a/app/models/user_type.rb +++ b/app/models/user_type.rb @@ -1,6 +1,6 @@ -class UserType < ActiveRecord::Base - attr_accessible :description, :name, :as => [:default, :admin] - - #associations between tables - has_many :users -end +class UserType < ActiveRecord::Base + attr_accessible :description, :name, :as => [:default, :admin] + + #associations between tables + has_many :users +end diff --git a/app/models/version.rb b/app/models/version.rb index 13e17c8..db03966 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -1,35 +1,41 @@ class Version < ActiveRecord::Base - + #associations between tables belongs_to :phase - + has_many :sections, :dependent => :destroy has_many :questions, :through => :sections, :dependent => :destroy has_many :plans - + #Link the data # accepts_nested_attributes_for :phase - accepts_nested_attributes_for :sections, :allow_destroy => true - - attr_accessible :id, :description, :number, :published, :title, :phase_id, + accepts_nested_attributes_for :sections, :allow_destroy => true + + attr_accessible :id, :description, :number, :published, :title, :phase_id, :sections_attributes, :as => [:default, :admin] - + + ## + # returns the title of the version + # + # @return [String] the title of the version def to_s "#{title}" end - - - + + + ## + # returns all sections where the org_id is the same as this version's phase's org_id + # + # @return [Array
      ] def global_sections sections.where("organisation_id = ? ", phase.dmptemplate.organisation_id).load end - + amoeba do include_association :sections include_association :questions set :published => 'false' - prepend :title => "Copy of " + prepend :title => "Copy of " end - - + end diff --git a/app/views/api/v0/dmptemplates/index.json.jbuilder b/app/views/api/v0/dmptemplates/index.json.jbuilder new file mode 100644 index 0000000..33ebd74 --- /dev/null +++ b/app/views/api/v0/dmptemplates/index.json.jbuilder @@ -0,0 +1,14 @@ +# builds a json response to api query for a list of all dmptemplates +json.prettify! + +json.templates Organisation.all.each do |org| + unless org.published_templates.blank? + json.organisation_name org.name + json.organisation_id org.id + json.organisation_templates org.published_templates.each do |template| + json.title template.title + json.id template.id + json.description template.description + end + end +end \ No newline at end of file diff --git a/app/views/api/v0/guidance_groups/index.json.jbuilder b/app/views/api/v0/guidance_groups/index.json.jbuilder index cae2288..908b19d 100644 --- a/app/views/api/v0/guidance_groups/index.json.jbuilder +++ b/app/views/api/v0/guidance_groups/index.json.jbuilder @@ -13,11 +13,7 @@ end json.templates @templates do |template| json.title template.title - end - - json.guidances guidance_group.guidances do |guidance| - json.text guidance.text - json.id guidance.id + json.id template.id end json.optional guidance_group.optional_subset diff --git a/app/views/api/v0/guidance_groups/show.json.jbuilder b/app/views/api/v0/guidance_groups/show.json.jbuilder index 4408430..1a412db 100644 --- a/app/views/api/v0/guidance_groups/show.json.jbuilder +++ b/app/views/api/v0/guidance_groups/show.json.jbuilder @@ -13,6 +13,7 @@ end json.templates @templates do |template| json.title template.title + json.id template.id end json.guidances @guidance_group.guidances do |guidance| diff --git a/app/views/api/v0/projects/create.json.jbuilder b/app/views/api/v0/projects/create.json.jbuilder index 8ed26fb..ebb8c58 100644 --- a/app/views/api/v0/projects/create.json.jbuilder +++ b/app/views/api/v0/projects/create.json.jbuilder @@ -1,15 +1,15 @@ -# builds a json response to a successful project createtion - -json.prettify! - -json.project do - json.title @project.title - # TODO add after decision on user creation/identification - #json.created_by @project.owner.email - json.id @project.id - json.created_at @project.created_at -end - -# json.location do -# json.link (url_for action: 'show', controller: 'project') -# end +# builds a json response to a successful project createtion + +json.prettify! + +json.project do + json.title @project.title + # TODO add after decision on user creation/identification + #json.created_by @project.owner.email + json.id @project.id + json.created_at @project.created_at +end + +# json.location do +# json.link (url_for action: 'show', controller: 'project') +# end diff --git a/app/views/api/v0/projects/show.json.jbuilder b/app/views/api/v0/projects/show.json.jbuilder index 6e9d391..2cd84bf 100644 --- a/app/views/api/v0/projects/show.json.jbuilder +++ b/app/views/api/v0/projects/show.json.jbuilder @@ -1,13 +1,13 @@ -# builds a json response to a successful project createtion - -json.prettify! - -json.project do - json.title @project.title - # TODO add after decision on user creation/identification - json.created_by @project.owner.email - json.id @project.id - json.created_at @project.created_at - #json.template @project.dmptemplate - json.dmptemplate @project.dmptemplate.title -end +# builds a json response to a successful project createtion + +json.prettify! + +json.project do + json.title @project.title + # TODO add after decision on user creation/identification + json.created_by @project.owner.email + json.id @project.id + json.created_at @project.created_at + #json.template @project.dmptemplate + json.dmptemplate @project.dmptemplate.title +end diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder new file mode 100644 index 0000000..1a05c9b --- /dev/null +++ b/app/views/api/v0/statistics/plans.json.jbuilder @@ -0,0 +1,25 @@ +json.prettify! + +json.plans @org_projects.each do |project| + json.id project.id + json.grant_number project.grant_number + json.org_id project.organisation_id + json.template do + json.title project.dmptemplate.title + json.id project.dmptemplate.id + end + json.project do + json.title project.title + end + json.funder do + json.name project.funder_name + end + json.principal_investigator do + json.name project.principal_investigator + end + json.data_contact do + json.info project.data_contact + end + json.description project.description + +end \ No newline at end of file diff --git a/app/views/api/v0/statistics/plans_by_template.json.jbuilder b/app/views/api/v0/statistics/plans_by_template.json.jbuilder new file mode 100644 index 0000000..155bbba --- /dev/null +++ b/app/views/api/v0/statistics/plans_by_template.json.jbuilder @@ -0,0 +1,20 @@ +json.prettify! +templates = {} +@org_projects.each do |project| + # if hash exists + if templates[project.dmptemplate.title].blank? + templates[project.dmptemplate.title] = {} + templates[project.dmptemplate.title][:title] = project.dmptemplate.title + templates[project.dmptemplate.title][:id] = project.dmptemplate.id + templates[project.dmptemplate.title][:uses] = 1 + else + templates[project.dmptemplate.title][:uses] += 1 + end +end + +json.templates templates.each do |template, info| + json.template_name info[:title] + json.template_id info[:id] + json.template_uses info[:uses] +end + diff --git a/app/views/api/v0/statistics/users_joined.json.jbuilder b/app/views/api/v0/statistics/users_joined.json.jbuilder new file mode 100644 index 0000000..4826bb7 --- /dev/null +++ b/app/views/api/v0/statistics/users_joined.json.jbuilder @@ -0,0 +1,4 @@ + +json.prettify! + +json.users_joined @users_count \ No newline at end of file diff --git a/app/views/api/v0/statistics/using_template.json.jbuilder b/app/views/api/v0/statistics/using_template.json.jbuilder new file mode 100644 index 0000000..04a77b6 --- /dev/null +++ b/app/views/api/v0/statistics/using_template.json.jbuilder @@ -0,0 +1,3 @@ +json.prettify! + +json.plans_using_template @template_count \ No newline at end of file diff --git a/app/views/contact_us/contact_mailer/contact_email.html.erb b/app/views/contact_us/contact_mailer/contact_email.html.erb index 57616f4..c8646c2 100644 --- a/app/views/contact_us/contact_mailer/contact_email.html.erb +++ b/app/views/contact_us/contact_mailer/contact_email.html.erb @@ -1,3 +1,3 @@ -

      <%= @contact.message %>

      -

      ---------------------

      -

      <%= ContactUs.require_name ? t('.sent_by_name', :email => @contact.email, :name => @contact.name) : t('.sent_by_contact_form', :email => @contact.email) %>

      +

      <%= @contact.message %>

      +

      ---------------------

      +

      <%= ContactUs.require_name ? t('.sent_by_name', :email => @contact.email, :name => @contact.name) : t('.sent_by_contact_form', :email => @contact.email) %>

      diff --git a/app/views/contact_us/contact_mailer/contact_email.text.plain.erb b/app/views/contact_us/contact_mailer/contact_email.text.plain.erb index 182f4f4..2bf3d27 100644 --- a/app/views/contact_us/contact_mailer/contact_email.text.plain.erb +++ b/app/views/contact_us/contact_mailer/contact_email.text.plain.erb @@ -1,4 +1,4 @@ -<%= @contact.message %> - -------------------------------------- +<%= @contact.message %> + +------------------------------------- <%= ContactUs.require_name ? t('.sent_by_name', :email => @contact.email, :name => @contact.name) : t('.sent_by_contact_form', :email => @contact.email) %> \ No newline at end of file diff --git a/app/views/contact_us/contacts/new_formtastic.html.erb b/app/views/contact_us/contacts/new_formtastic.html.erb index fe182db..8554019 100644 --- a/app/views/contact_us/contacts/new_formtastic.html.erb +++ b/app/views/contact_us/contacts/new_formtastic.html.erb @@ -1,8 +1,8 @@ -

      <%= t('.contact_us') %>

      -<%= semantic_form_for @contact, :url => contacts_path do |f| %> - <%= f.input :name, :label => t('.name') if ContactUs.require_name %> - <%= f.input :email, :label => t('.email') %> - <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %> - <%= f.input :message, :as => :text, :label => t('.message') %> - <%= f.action :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %> -<% end %> +

      <%= t('.contact_us') %>

      +<%= semantic_form_for @contact, :url => contacts_path do |f| %> + <%= f.input :name, :label => t('.name') if ContactUs.require_name %> + <%= f.input :email, :label => t('.email') %> + <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %> + <%= f.input :message, :as => :text, :label => t('.message') %> + <%= f.action :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %> +<% end %> diff --git a/app/views/contact_us/contacts/new_simple_form.html.erb b/app/views/contact_us/contacts/new_simple_form.html.erb index d863cf3..b4593f0 100644 --- a/app/views/contact_us/contacts/new_simple_form.html.erb +++ b/app/views/contact_us/contacts/new_simple_form.html.erb @@ -1,8 +1,8 @@ -

      <%= t('.contact_us') %>

      -<%= simple_form_for @contact, :url => contacts_path do |f| %> - <%= f.input :name, :label => t('.name') if ContactUs.require_name %> - <%= f.input :email, :label => t('.email') %> - <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %> - <%= f.input :message, :as => :text, :label => t('.message') %> - <%= f.button :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %> -<% end %> +

      <%= t('.contact_us') %>

      +<%= simple_form_for @contact, :url => contacts_path do |f| %> + <%= f.input :name, :label => t('.name') if ContactUs.require_name %> + <%= f.input :email, :label => t('.email') %> + <%= f.input :subject, :label => t('.subject') if ContactUs.require_subject %> + <%= f.input :message, :as => :text, :label => t('.message') %> + <%= f.button :submit, :label => t('.submit'), :button_html => { :alt => t('.submit'), :id => 'contact_us_contact_submit', :title => t('.submit') } %> +<% end %> diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index d5cc21d..f5fadfb 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,12 +1,12 @@ -

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

      - -<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> - -
      <%= f.label :email %>
      - <%= f.email_field :email, :autofocus => true %>
      - -
      <%= f.submit t('custom_devise.resend_confirmation') %>
      -<% end %> - -<%= render "devise/shared/links" %> +

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

      + +<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
      <%= f.label :email %>
      + <%= f.email_field :email, :autofocus => true %>
      + +
      <%= f.submit t('custom_devise.resend_confirmation') %>
      +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/invitations/edit.html.erb b/app/views/devise/invitations/edit.html.erb index c6071dc..4a4b73e 100644 --- a/app/views/devise/invitations/edit.html.erb +++ b/app/views/devise/invitations/edit.html.erb @@ -1,15 +1,15 @@ -

      <%= t "devise.invitations.edit.header" %>

      -
      - <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :invitation_token %> - -

      <%= f.label :password %>
      - <%= f.password_field :password %>

      - -

      <%= f.label :password_confirmation %>
      - <%= f.password_field :password_confirmation %>

      - -

      <%= f.submit t("devise.invitations.edit.submit_button") %>

      - <% end %> -
      +

      <%= t "devise.invitations.edit.header" %>

      +
      + <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :invitation_token %> + +

      <%= f.label :password %>
      + <%= f.password_field :password %>

      + +

      <%= f.label :password_confirmation %>
      + <%= f.password_field :password_confirmation %>

      + +

      <%= f.submit t("devise.invitations.edit.submit_button") %>

      + <% end %> +
      diff --git a/app/views/devise/invitations/new.html.erb b/app/views/devise/invitations/new.html.erb index 3602bb4..3567356 100644 --- a/app/views/devise/invitations/new.html.erb +++ b/app/views/devise/invitations/new.html.erb @@ -1,14 +1,14 @@ -

      <%= t "devise.invitations.new.header" %>

      -
      - <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %> - <%= devise_error_messages! %> - - <% resource.class.invite_key_fields.each do |field| -%> -

      <%= f.label field %>
      - <%= f.text_field field %>

      - <% end -%> - -

      <%= f.submit t("devise.invitations.new.submit_button") %>

      - <% end %> - +

      <%= t "devise.invitations.new.header" %>

      +
      + <%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %> + <%= devise_error_messages! %> + + <% resource.class.invite_key_fields.each do |field| -%> +

      <%= f.label field %>
      + <%= f.text_field field %>

      + <% end -%> + +

      <%= f.submit t("devise.invitations.new.submit_button") %>

      + <% end %> +
      \ No newline at end of file diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index 08c61ba..c1faca5 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.thank_you_and_confirm') %>

      - +

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

      + +

      <%= 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 diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb index 2828329..7beb75d 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.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') %>

      - +

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

      + +

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

      + <%= 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 1638d2e..b4c0ac6 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.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.hello') %> <%= @resource.email %>!

      + +

      <%= 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') %> diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb index 955c0c7..0346189 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.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.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.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/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 08fbf6c..a82a78f 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,26 +1,26 @@ -

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

      -
      - - <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> -
      - - - - - - - - - -
      <%= t('helpers.new_password') %><%= f.password_field :password, :autofocus => true %>
      <%= t('helpers.password') %><%= f.password_field :password_confirmation %>
      -
      - <%= f.submit t('helpers.save'), :class => 'btn btn-primary' %> -
      -
      - <% end %> - - <%= render "devise/shared/links" %> - -
      +

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

      +
      + + <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> +
      + + + + + + + + + +
      <%= t('helpers.new_password') %><%= f.password_field :password, :autofocus => true %>
      <%= t('helpers.password') %><%= f.password_field :password_confirmation %>
      +
      + <%= f.submit t('helpers.save'), :class => 'btn btn-primary' %> +
      +
      + <% end %> + + <%= render "devise/shared/links" %> + +
      diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 33d9a27..f95b651 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,26 +1,26 @@ -

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

      -
      - - <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> -
      - - - - - -
      <%= t("helpers.email") %> -

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

      - -       		<%= f.email_field :email, :autofocus => true , :style => "width:95%;" %>
      - - -
      -
      - <%= f.submit t("helpers.send"), :class => "btn btn-primary", :id => "send_btn" %> -
      - <% end %> - -<%= render "devise/shared/links" %> - -
      +

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

      +
      + + <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> +
      + + + + + +
      <%= t("helpers.email") %> +

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

      + +       		<%= f.email_field :email, :autofocus => true , :style => "width:95%;" %>
      + + +
      +
      + <%= f.submit t("helpers.send"), :class => "btn btn-primary", :id => "send_btn" %> +
      + <% end %> + +<%= render "devise/shared/links" %> + +
      diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 6b85dc8..9be1fed 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,14 +1,14 @@

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

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

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

      +

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

      @@ -38,7 +38,7 @@ <% other_organisations = Array.new %> @@ -51,6 +51,13 @@ :as => :string, :class => "text_field has-tooltip reg-input", "data-toggle" => "tooltip", "data-container" => "body", "title" => t("helpers.org_type.other_org_help_text") %> + + + + - - - - - + + + + + + + diff --git a/app/views/dmptemplates/_preview_question.html.erb b/app/views/dmptemplates/_preview_question.html.erb index f055bfa..79d6459 100644 --- a/app/views/dmptemplates/_preview_question.html.erb +++ b/app/views/dmptemplates/_preview_question.html.erb @@ -1,124 +1,124 @@ - - -
      - - - <% q_format = question.question_format%> -
      -
      - - <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%> - <% options = question.options.order("number") %> - - - <% if q_format.title == t("helpers.checkbox") then %> - <%if !options.nil? then %> -
      - -
        - <% options.each do |op|%> -
        2. - <%end%> -
      -
      - <%end%> - - <% elsif q_format.title == t("helpers.multi_select_box") then %> - <%if !options.nil? then %> - - - <%end%> - - <% elsif q_format.title == t("helpers.radio_buttons") then%> - <%if !options.nil? then %> -
      - -
        - <% options.each do |op|%> -
        2. - <%end%> -
      -
      - <%end%> - - <% elsif q_format.title == t("helpers.dropdown") then%> - <%if !options.nil? then %> - - - <%end%> - <% end %> - - - <% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %> - <% if !suggested_answer.nil? && suggested_answer.text != "" then %> -
      - - <% if suggested_answer.is_example? then %> - <%= t("org_admin.questions.example_answer_label")%> - <%else%> - <%= t("org_admin.questions.suggested_answer_label")%> - <%end%> - -
      -

      - <%= raw suggested_answer.text %> -

      -
      -
      - <% end %> - -
      - - <% else %> - - - <% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %> - <% if !suggested_answer.nil? && suggested_answer.text != "" then %> -
      - - <% if suggested_answer.is_example? then %> - <%= t("org_admin.questions.example_answer_label")%> - <%else%> - <%= t("org_admin.questions.suggested_answer_label")%> - <%end%> - -
      -

      - <%= raw suggested_answer.text %> -

      -
      -
      - <% end %> - - <% end %> - - - - - <% if q_format.title == t("helpers.text_field") then %> - - - <%elsif q_format.title == t("helpers.text_area") then%> - - <%end%> -
      - - <%= link_to t("helpers.save"), "#", :class => "btn btn-primary", :onclick => "event.preventDefault();" %> - - <%= t("helpers.notanswered") %> - -
      - -
      - - - -<%= render :partial => "guidance_display", locals: {question: question}%> + + +
      + + + <% q_format = question.question_format%> +
      +
      + + <% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%> + <% options = question.options.order("number") %> + + + <% if q_format.title == t("helpers.checkbox") then %> + <%if !options.nil? then %> +
      + +
        + <% options.each do |op|%> +
        2. + <%end%> +
      +
      + <%end%> + + <% elsif q_format.title == t("helpers.multi_select_box") then %> + <%if !options.nil? then %> + + + <%end%> + + <% elsif q_format.title == t("helpers.radio_buttons") then%> + <%if !options.nil? then %> +
      + +
        + <% options.each do |op|%> +
        2. + <%end%> +
      +
      + <%end%> + + <% elsif q_format.title == t("helpers.dropdown") then%> + <%if !options.nil? then %> + + + <%end%> + <% end %> + + + <% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %> + <% if !suggested_answer.nil? && suggested_answer.text != "" then %> +
      + + <% if suggested_answer.is_example? then %> + <%= t("org_admin.questions.example_answer_label")%> + <%else%> + <%= t("org_admin.questions.suggested_answer_label")%> + <%end%> + +
      +

      + <%= raw suggested_answer.text %> +

      +
      +
      + <% end %> + +
      + + <% else %> + + + <% suggested_answer = question.suggested_answers.find_by_organisation_id(current_user.organisation_id) %> + <% if !suggested_answer.nil? && suggested_answer.text != "" then %> +
      + + <% if suggested_answer.is_example? then %> + <%= t("org_admin.questions.example_answer_label")%> + <%else%> + <%= t("org_admin.questions.suggested_answer_label")%> + <%end%> + +
      +

      + <%= raw suggested_answer.text %> +

      +
      +
      + <% end %> + + <% end %> + + + + + <% if q_format.title == t("helpers.text_field") then %> + + + <%elsif q_format.title == t("helpers.text_area") then%> + + <%end%> +
      + + <%= link_to t("helpers.save"), "#", :class => "btn btn-primary", :onclick => "event.preventDefault();" %> + + <%= t("helpers.notanswered") %> + +
      + +
      + + + +<%= render :partial => "guidance_display", locals: {question: question}%> diff --git a/app/views/dmptemplates/_show_phase.html.erb b/app/views/dmptemplates/_show_phase.html.erb index af8c397..01117cf 100644 --- a/app/views/dmptemplates/_show_phase.html.erb +++ b/app/views/dmptemplates/_show_phase.html.erb @@ -4,18 +4,18 @@ <%= t('org_admin.templates.phase_details_label')%> - <% if @phase.dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> + <% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>
      <%= link_to t("org_admin.templates.edit_phase_details_label"), '#', :class => "btn btn-primary", :id => "edit_phase_button"%>
      <%end%> -<%if @phase.dmptemplate.org_type != t("helpers.org_type.funder") then%> +<%if @phase.dmptemplate.org_type != constant("organisation_types.funder") then%>
      <%= raw t('org_admin.templates.phase_details_text_html')%> -
      -<%end%> + +<%end%>
      @@ -34,4 +34,4 @@
      <%= t("helpers.org_type.organisation") %> <%= collection_select(:user, :organisation_id, Organisation.where("parent_id IS NULL").order("name"), - :id, :name, {include_blank: t("helpers.org_type.organisation")}, + :id, :name, {include_blank: constant("organisation_types.organisation")}, { :class => "typeahead org_sign_up" }) %>
      <%= t('helpers.user_details_language') %><%= collection_select(:user, + :language_id, Language.all.order("name"), + :id, :name, {:selected => Language.where(default_language: true).first.id}, + {:class => "typeahead org_sign_up"}) %>
      <%= t("helpers.orcid_id") %> <%= f.text_field :orcid_id , @@ -119,20 +126,20 @@ <%# = button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %> - + diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 0c3ca00..5406165 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,13 +1,13 @@ -

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

      -<% unless session[:shibboleth_data].nil? %> -

      - <%= raw t('helpers.sign_up_shibboleth_alert_text_html')%> -

      - <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %> -<% end %> - -
      -
      - - <%= render :partial => 'shared/register_form', locals: {extended: true} %> +

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

      +<% unless session[:shibboleth_data].nil? %> +

      + <%= raw t('helpers.sign_up_shibboleth_alert_text_html')%> +

      + <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %> +<% end %> + +
      +
      + + <%= render :partial => 'shared/register_form', locals: {extended: true} %>
      \ No newline at end of file diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 2f0d3bb..95c5cf1 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,33 +1,33 @@ -

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

      -
      - - <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
      - - - - - - - - - - - - - -
      <%= t("helpers.email") %><%= f.email_field :email, :autofocus => true %>
      <%= t("helpers.password") %><%= f.password_field :password %>
      <% if devise_mapping.rememberable? -%> -
      - <%= f.check_box :remember_me %> - <%= f.label :remember_me %> -
      - <% end -%> -
      -
      - <%= f.submit t("helpers.sign_in"), :class => "btn btn-primary" %> -
      -
      - <% end %> - - <%= render "devise/shared/links" %> -
      +

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

      +
      + + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> +
      + + + + + + + + + + + + + +
      <%= t("helpers.email") %><%= f.email_field :email, :autofocus => true %>
      <%= t("helpers.password") %><%= f.password_field :password %>
      <% if devise_mapping.rememberable? -%> +
      + <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
      + <% end -%> +
      +
      + <%= f.submit t("helpers.sign_in"), :class => "btn btn-primary" %> +
      +
      + <% end %> + + <%= render "devise/shared/links" %> +
      diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index 9de3361..44a1965 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -1,17 +1,17 @@ -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to t('helpers.forgot_password'), new_password_path(resource_name), :class => "a-orange"%>
      -<% end -%> - -<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to t('helpers.no_pass_instructions'), new_confirmation_path(resource_name), :class => "a-orange"%>
      -<% end -%> - -<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to t('helpers.no_unlock_instructions'), new_unlock_path(resource_name), :class => "a-orange" %>
      -<% end -%> - -<%#- if devise_mapping.omniauthable? %> - <%#- resource_class.omniauth_providers.each do |provider| %> - <%#= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
      - <%# end -%> +<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to t('helpers.forgot_password'), new_password_path(resource_name), :class => "a-orange"%>
      +<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to t('helpers.no_pass_instructions'), new_confirmation_path(resource_name), :class => "a-orange"%>
      +<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to t('helpers.no_unlock_instructions'), new_unlock_path(resource_name), :class => "a-orange" %>
      +<% end -%> + +<%#- if devise_mapping.omniauthable? %> + <%#- resource_class.omniauth_providers.each do |provider| %> + <%#= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
      + <%# end -%> <%# end -%> \ No newline at end of file diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index b632e4f..40792b2 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,12 +1,12 @@ -

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

      - -<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> - -
      <%= f.label :email %>
      - <%= f.email_field :email, :autofocus => true %>
      - -
      <%= f.submit "Resend unlock instructions" %>
      -<% end %> - -<%= render "devise/shared/links" %> +

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

      + +<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= devise_error_messages! %> + +
      <%= f.label :email %>
      + <%= f.email_field :email, :autofocus => true %>
      + +
      <%= f.submit "Resend unlock instructions" %>
      +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/dmptemplates/_add_question.html.erb b/app/views/dmptemplates/_add_question.html.erb index 08d7450..1caf54c 100644 --- a/app/views/dmptemplates/_add_question.html.erb +++ b/app/views/dmptemplates/_add_question.html.erb @@ -177,5 +177,3 @@ <%end%> - - diff --git a/app/views/dmptemplates/_add_section.html.erb b/app/views/dmptemplates/_add_section.html.erb index e5facd8..b445c85 100644 --- a/app/views/dmptemplates/_add_section.html.erb +++ b/app/views/dmptemplates/_add_section.html.erb @@ -1,54 +1,54 @@ - - -<% @new_section = Section.new %> -<% @new_section.number = version.sections.count + 1 %> - - -<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %> - <%= f.hidden_field :version_id, :value => version.id %> - <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %> - -
      -
      -
      -
      - - <%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%> -
      - - -
      - -
      -
      -
      - - - - - - - - - -
      <%= t("org_admin.templates.phase_order_label") %> - <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %>
      <%= t("org_admin.templates.desc_label") %> -
      - <%= text_area_tag("section-desc", "" , class: "tinymce") %> -
      -
      - <%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%> -
      -
      - -
      - <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %> -
      -
      -
      -
      -
      -<%end%> - - + + +<% @new_section = Section.new %> +<% @new_section.number = version.sections.count + 1 %> + + +<%= form_for @new_section, :url => {:action => "admin_createsection"} do |f| %> + <%= f.hidden_field :version_id, :value => version.id %> + <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %> + +
      +
      +
      +
      + + <%= f.text_field :title, :as => :string, :class => "text_field", :placeholder => t("org_admin.templates.section_title_placeholder")%> +
      + + +
      + +
      +
      +
      + + + + + + + + + +
      <%= t("org_admin.templates.phase_order_label") %> + <%= f.number_field :number, :in => 1..15, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.section_number_help_text") %>
      <%= t("org_admin.templates.desc_label") %> +
      + <%= text_area_tag("section-desc", "" , class: "tinymce") %> +
      +
      + <%= link_to( image_tag("help_button.png"), "#", :class => "section_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.section_desc_help_text_html"))%> +
      +
      + +
      + <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.cancel"), "#", :id => "", :class => "btn cancel" %> +
      +
      +
      +
      +
      +<%end%> + + diff --git a/app/views/dmptemplates/_add_suggested_answer.html.erb b/app/views/dmptemplates/_add_suggested_answer.html.erb index ec9d98b..03e11b7 100644 --- a/app/views/dmptemplates/_add_suggested_answer.html.erb +++ b/app/views/dmptemplates/_add_suggested_answer.html.erb @@ -1,25 +1,25 @@ - -<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %> - <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %> - <%= f.hidden_field :question_id, :value => question.id %> - - - - - - -
      <%= t("org_admin.questions.suggested_or_example_answer_label")%> -
        -
      • <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
        • -
      • <%= f.text_area :text, :rows => 5 %> -
        • -
      -
      -
      - - -
      - <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %> -
      -<%end%> + +<%= form_for :suggested_answer, :url => {:action => "admin_createsuggestedanswer"} do |f| %> + <%= f.hidden_field :organisation_id, :value => current_user.organisation.id %> + <%= f.hidden_field :question_id, :value => question.id %> + + + + + + +
      <%= t("org_admin.questions.suggested_or_example_answer_label")%> +
        +
      • <%= f.select :is_example, {t("org_admin.questions.example_answer_label") => true, t("org_admin.questions.suggested_answer_label") => false} %>
        • +
      • <%= f.text_area :text, :rows => 5 %> +
        • +
      +
      +
      + + +
      + <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.cancel"), "#", :id => "cancel_suugested_answer", :class => "btn cancel" %> +
      +<%end%> diff --git a/app/views/dmptemplates/_admin_nav_tabs.html.erb b/app/views/dmptemplates/_admin_nav_tabs.html.erb index f04a7a1..6974892 100644 --- a/app/views/dmptemplates/_admin_nav_tabs.html.erb +++ b/app/views/dmptemplates/_admin_nav_tabs.html.erb @@ -1,4 +1,4 @@ - +
      <%= 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 %><%= t('org_admin.remove_option_label') %>
      <%= 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 %><%= t('org_admin.remove_option_label') %>
      <%= raw @phase.description %>
      -
      \ No newline at end of file +
      diff --git a/app/views/dmptemplates/_show_phases_sections.html.erb b/app/views/dmptemplates/_show_phases_sections.html.erb index e0640bc..6822565 100644 --- a/app/views/dmptemplates/_show_phases_sections.html.erb +++ b/app/views/dmptemplates/_show_phases_sections.html.erb @@ -1,36 +1,36 @@
      - +

      <%= raw phase.description %>

      -
      +
      <% if phase.versions.any? then %> - + <% version = phase.versions.where("published = ?", true).first %> <% if version.nil? then%> <% version = phase.versions.order("updated_at DESC").first %> <%end%> - - + +
      - + <%if phase.has_sections == true then %> <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(version), :class => 'btn btn-primary'%> - <%end%> + <%end%> <% if phase.latest_published_version == nil then%> <%= link_to t("helpers.submit.delete"), admin_destroyphase_dmptemplate_path(:phase_id => phase.id), :confirm => t("org_admin.templates.phase_delete_message", :phase_title => phase.title ), :method => :delete, :class => "btn btn-primary"%> - <%end%> - <%if phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder") then%> + <%end%> + <%if phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder") then%> <% b_label = t('org_admin.templates.view_phase_label')%> <%else %> <% b_label = t('org_admin.templates.edit_phase_label')%> - <%end%> + <%end%> <%= link_to b_label, admin_phase_dmptemplate_path(phase), :class => "btn btn-primary" %> - +
      <% if version.sections.any? then %> @@ -47,26 +47,27 @@ - - <%end%> + <%end%> <%end%> - +

      <%= section.title %>

      		 + <% if section.questions.any? %> <% questions = section.questions.order("number ASC") %>
        <% questions.each do |ques|%>
      • - <%= ques.text %> -
        • + <%end%>
      - <%end%> + <%end%>
      - + <%end%> - -<%end%> + +<%end%> +
      \ No newline at end of file diff --git a/app/views/dmptemplates/_show_question.html.erb b/app/views/dmptemplates/_show_question.html.erb index da4d1fb..df79c2b 100644 --- a/app/views/dmptemplates/_show_question.html.erb +++ b/app/views/dmptemplates/_show_question.html.erb @@ -12,7 +12,7 @@ <%= t('org_admin.questions.question_number_label')%> <%= question.number%> - + <%= t('org_admin.questions.question_text_label')%> @@ -28,7 +28,7 @@ <% if !question.options.to_a.nil? then %> <% question.options.to_a.sort_by{|op| op['number']}.each do |o| %>
    • - <%= o.text %>
      • - <%end%> + <%end%> <% end %> <% end %> @@ -43,7 +43,7 @@ <%= t('org_admin.questions.default_value_label')%> <%= raw question.default_value %> - <%end%> + <%end%> <% end %> @@ -57,12 +57,12 @@ <%= t("org_admin.questions.option_comment_hide")%> <%end%> <%end%> -
      +
      - + - <% if (question.section.version.phase.dmptemplate.org_type != t("helpers.org_type.funder") && question.section.organisation_id == current_user.organisation_id ) then%> + <% if (question.section.version.phase.dmptemplate.org_type != constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id ) then%> <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> <% if !suggested_answer.nil? && suggested_answer.text != "" then %> @@ -71,12 +71,12 @@ <%= t('org_admin.questions.example_answer_label')%> <%else%> <%= t('org_admin.questions.suggested_answer_label')%> - <%end%> + <%end%> <%= raw suggested_answer.text %> <%end%> - <%end%> + <%end%> <%if !question.guidance.nil? then %> @@ -92,9 +92,9 @@ <% i = 1%> <% themes_q.each do |t|%> <%= t.title %> - <% if themes_q.count > i then%> - , - <% i +=1 %> + <% if themes_q.count > i then%> + , + <% i +=1 %> <% end %> <%end%> @@ -103,7 +103,7 @@
      - <% if (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id != current_user.organisation_id ) then%> + <% if (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%> <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> <% if !suggested_answer.nil? && suggested_answer.text != "" then %>
      @@ -112,20 +112,20 @@ - + <%end%> - - + + - - +
      + + <%end%> - +
      - <%if (@edit == 'true'&& question.section.organisation_id == current_user.organisation_id) || (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id == current_user.organisation_id && current_user.org_type != t("helpers.org_type.funder")) then%> + <%if (@edit == 'true'&& question.section.organisation_id == current_user.organisation_id) || (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder")) then%>
      <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> <%= link_to t("org_admin.questions.question_edit_button"), '# ', :class => "btn btn-primary edit_question_button"%> @@ -134,20 +134,20 @@ :confirm => t("org_admin.questions.delete_message", :question_text => question.text ), :method => :delete, :class => "btn btn-primary"%> <%end%>
      - <%elsif (@edit == 'false' && question.section.organisation_id != current_user.organisation_id )|| (question.section.version.phase.dmptemplate.org_type == t("helpers.org_type.funder") && question.section.organisation_id != current_user.organisation_id ) then%> + <%elsif (@edit == 'false' && question.section.organisation_id != current_user.organisation_id )|| (question.section.version.phase.dmptemplate.org_type == constant("organisation_types.funder") && question.section.organisation_id != current_user.organisation_id ) then%> <% suggested_answer = question.get_suggested_answer(current_user.organisation.id) %> <% if suggested_answer.nil? then %>
      <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> <%= link_to t("org_admin.questions.suggested_or_example_answer_button"), '# ', :class => "btn btn-primary add_suggested_answer_button"%> -
      -
      - <%end%> +
      +
      + <%end%> <%end%>
      -
      +
      - + <%= render :partial => 'guidance_display', locals: {question: question}%> diff --git a/app/views/dmptemplates/_show_section.html.erb b/app/views/dmptemplates/_show_section.html.erb index 7041cc0..1dbf719 100644 --- a/app/views/dmptemplates/_show_section.html.erb +++ b/app/views/dmptemplates/_show_section.html.erb @@ -1,43 +1,43 @@ - -<%if @open && @section_id == section.id then%> - <% toggle = 'accordion-body section-collapse in collapse'%> -<%else%> - <% toggle = 'accordion-body collapse section-collapse' %> -<%end%> -
      -
      - -
      - <% if section.title == '' then%> - <%= t('org_admin.templates.new_section')%> - <%else%> - <%= section.title %> - <%end%> -
      - - -       -
      -
      -
      - <%= raw section.description %> -
      -
      - <% section.questions.order("number").each do |question| %> - <% last_question_id = section.questions.order("number DESC").first.id %> - -
      - - <%= render :partial => 'show_question', locals: {question: question}%> -
      - - <% if last_question_id == question.id then %> -
      - <% else %> -
      - <% end %> - - <%end%> -
      -
      -
      + +<%if @open && @section_id == section.id then%> + <% toggle = 'accordion-body section-collapse in collapse'%> +<%else%> + <% toggle = 'accordion-body collapse section-collapse' %> +<%end%> +
      +
      + +
      + <% if section.title == '' then%> + <%= t('org_admin.templates.new_section')%> + <%else%> + <%= section.title %> + <%end%> +
      + + +       +
      +
      +
      + <%= raw section.description %> +
      +
      + <% section.questions.order("number").each do |question| %> + <% last_question_id = section.questions.order("number DESC").first.id %> + +
      + + <%= render :partial => 'show_question', locals: {question: question}%> +
      + + <% if last_question_id == question.id then %> +
      + <% else %> +
      + <% end %> + + <%end%> +
      +
      +
      diff --git a/app/views/dmptemplates/_show_suggested_answer.html.erb b/app/views/dmptemplates/_show_suggested_answer.html.erb index c20fff6..888dd45 100644 --- a/app/views/dmptemplates/_show_suggested_answer.html.erb +++ b/app/views/dmptemplates/_show_suggested_answer.html.erb @@ -1,19 +1,19 @@ - - - - - - -
      - <% if suggested_answer.is_example? then %> - <%= t('org_admin.questions.example_answer_label')%> - <%else%> - <%= t('org_admin.questions.suggested_answer_label')%> - <%end%> - <%= raw suggested_answer.text %>
      -
      - -
      - <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> - <%= link_to t("org_admin.questions.edit_suggested_answer_button"), '# ', :class => "btn btn-primary edit_form_for_suggested_answer"%> -
      + + + + + + +
      + <% if suggested_answer.is_example? then %> + <%= t('org_admin.questions.example_answer_label')%> + <%else%> + <%= t('org_admin.questions.suggested_answer_label')%> + <%end%> + <%= raw suggested_answer.text %>
      +
      + +
      + <%= hidden_field_tag :question_id, question.id, :class => "question_id" %> + <%= link_to t("org_admin.questions.edit_suggested_answer_button"), '# ', :class => "btn btn-primary edit_form_for_suggested_answer"%> +
      diff --git a/app/views/dmptemplates/_show_template.html.erb b/app/views/dmptemplates/_show_template.html.erb index a904ebb..7cfec9d 100644 --- a/app/views/dmptemplates/_show_template.html.erb +++ b/app/views/dmptemplates/_show_template.html.erb @@ -1,6 +1,6 @@ -<% if @dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> +<% if @dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %>

      <%= link_to t("org_admin.templates.edit_details"), '# ', :class => "btn btn-primary", :id => "edit_template_button"%> @@ -41,4 +41,3 @@ <%= l dmptemplate.updated_at.to_date, :formats => :short %> -
      \ No newline at end of file diff --git a/app/views/dmptemplates/_show_version.html.erb b/app/views/dmptemplates/_show_version.html.erb index 0214afe..3e1456e 100644 --- a/app/views/dmptemplates/_show_version.html.erb +++ b/app/views/dmptemplates/_show_version.html.erb @@ -1,42 +1,42 @@ - - - -

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

      -
      - - - - - - - <% if version.description != "" then%> - - - - - <%end%> - - - - - - - - - - - - -
      <%= t('org_admin.templates.title_label') %><%= version.title %>
      <%= t('org_admin.templates.desc_label') %><%= raw version.description %>
      <%= t('org_admin.templates.published_label') %><%= version.published %>
      <%= t('org_admin.templates.created') %> - <%= l version.created_at.to_date, :formats => :short %> -
      <%= t('org_admin.templates.last_updated') %> - <%= l version.updated_at.to_date, :formats => :short %> -
      -
      - - - - - + + + +

      + <%= t('org_admin.templates.version_details_label')%> +

      +
      + + + + + + + <% if version.description != "" then%> + + + + + <%end%> + + + + + + + + + + + + +
      <%= t('org_admin.templates.title_label') %><%= version.title %>
      <%= t('org_admin.templates.desc_label') %><%= raw version.description %>
      <%= t('org_admin.templates.published_label') %><%= version.published %>
      <%= t('org_admin.templates.created') %> + <%= l version.created_at.to_date, :formats => :short %> +
      <%= t('org_admin.templates.last_updated') %> + <%= l version.updated_at.to_date, :formats => :short %> +
      +
      + + + + + diff --git a/app/views/dmptemplates/_versions_table.html.erb b/app/views/dmptemplates/_versions_table.html.erb index 3e38730..259fb5f 100644 --- a/app/views/dmptemplates/_versions_table.html.erb +++ b/app/views/dmptemplates/_versions_table.html.erb @@ -1,72 +1,72 @@ -<%if !phase.versions.nil? then %> -
      -

      <%= t('org_admin.templates.versions_label')%>

      -

      - <%= t('org_admin.versions.versions_text_html')%> -

      - - - - - - - - - - - - - <% phase.versions.each do |v|%> - - - - - - - - - - - - - <%end%> - -
      <%= t('org_admin.templates.title_label')%><%= t('org_admin.templates.published_label')%><%= t('org_admin.templates.created')%><%= t('org_admin.templates.last_updated') %><%= t('org_admin.templates.actions') %>
      - <%= v.title %> - - <%= v.published %> - - <%= l v.created_at.to_date, :formats => :short %> - - <%= l v.updated_at.to_date, :formats => :short %> - - <%= link_to t("helpers.view"), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'false'), :class => "dmp_table_link"%> - <% if v.published? then%> - - <%= t('org_admin.versions.edit_label')%> - - <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %> - <%else%> - <%= link_to t("org_admin.versions.edit_label"), admin_phase_dmptemplate_path(phase, :version_id => v.id, :edit => 'true'), :class => "dmp_table_link" %> - <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %> - <%#= link_to t("helpers.submit.delete"), admin_destroyversion_dmptemplate_path(:version_id => v.id, :phase => phase , :edit => 'false'), - :confirm => t("org_admin.versions.delete_message", :version_title => v.title ), :method => :delete, :class => "dmp_table_link"%> - <%end%> -
      -
      - - - -<%end%> +<%if !phase.versions.nil? then %> +
      +

      <%= t('org_admin.templates.versions_label')%>

      +

      + <%= t('org_admin.versions.versions_text_html')%> +

      + + + + + + + + + + + + + <% phase.versions.each do |v|%> + + + + + + + + + + + + + <%end%> + +
      <%= t('org_admin.templates.title_label')%><%= t('org_admin.templates.published_label')%><%= t('org_admin.templates.created')%><%= t('org_admin.templates.last_updated') %><%= t('org_admin.templates.actions') %>
      + <%= v.title %> + + <%= v.published %> + + <%= l v.created_at.to_date, :formats => :short %> + + <%= l v.updated_at.to_date, :formats => :short %> + + <%= link_to t("helpers.view"), admin_phase_dmptemplate_path( :version_id => v.id, :id => phase.id , :edit => 'false'), :class => "dmp_table_link"%> + <% if v.published? then%> + + <%= t('org_admin.versions.edit_label')%> + + <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %> + <%else%> + <%= link_to t("org_admin.versions.edit_label"), admin_phase_dmptemplate_path(phase, :version_id => v.id, :edit => 'true'), :class => "dmp_table_link" %> + <%= link_to t("helpers.preview"), admin_previewphase_dmptemplate_path(v), :class => "dmp_table_link" %> + <%#= link_to t("helpers.submit.delete"), admin_destroyversion_dmptemplate_path(:version_id => v.id, :phase => phase , :edit => 'false'), + :confirm => t("org_admin.versions.delete_message", :version_title => v.title ), :method => :delete, :class => "dmp_table_link"%> + <%end%> +
      +
      + + + +<%end%> diff --git a/app/views/dmptemplates/admin_addphase.html.erb b/app/views/dmptemplates/admin_addphase.html.erb index d8109eb..6e8a336 100644 --- a/app/views/dmptemplates/admin_addphase.html.erb +++ b/app/views/dmptemplates/admin_addphase.html.erb @@ -1,75 +1,75 @@ -<%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %> -<% javascript "admin.js" %> - -

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

      - -
      - - -<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "add_plan"} %> - - -
      -
      - - -
      -
      - - - <%= form_for :phase, :url => { :action => "admin_createphase"} do |f| %> -

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

      - <%= raw t("org_admin.templates.phase_new_text_html")%> -
      -
      - <%= f.hidden_field :dmptemplate_id, :value => @dmptemplate.id%> - - - - - - - - - - - - - -
      <%= t("org_admin.templates.title_label") %><%= f.text_field :title, - :as => :string, - :class => "text_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_title_help_text") %>
      <%= t("org_admin.templates.phase_order_label") %><%= f.number_field :number, :in => 1..5, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_number_help_text") %>
      <%= t("org_admin.templates.desc_label") %> -
      - <%= text_area_tag("phase-desc","" , class: "tinymce") %> -
      -
      - <%= link_to( image_tag("help_button.png"), "#", :class => "phase_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.phase_desc_help_text_html"))%> -
      -
      -
      -
      - - -
      - <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), admin_dmptemplate_path(@dmptemplate), :class => "btn cancel" %> -
      - - <%end%> -
      -
      -
      -
      - +<%- model_class = Phase -%> +<%= stylesheet_link_tag "admin" %> +<% javascript "admin.js" %> + +

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

      + +
      + + +<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @dmptemplate, active: "add_plan"} %> + + +
      +
      + + +
      +
      + + + <%= form_for :phase, :url => { :action => "admin_createphase"} do |f| %> +

      + <%= t("org_admin.templates.phase_details_label")%> +

      + <%= raw t("org_admin.templates.phase_new_text_html")%> +
      +
      + <%= f.hidden_field :dmptemplate_id, :value => @dmptemplate.id%> + + + + + + + + + + + + + +
      <%= t("org_admin.templates.title_label") %><%= f.text_field :title, + :as => :string, + :class => "text_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_title_help_text") %>
      <%= t("org_admin.templates.phase_order_label") %><%= f.number_field :number, :in => 1..5, :class => "number_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.phase_number_help_text") %>
      <%= t("org_admin.templates.desc_label") %> +
      + <%= text_area_tag("phase-desc","" , class: "tinymce") %> +
      +
      + <%= link_to( image_tag("help_button.png"), "#", :class => "phase_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.templates.phase_desc_help_text_html"))%> +
      +
      +
      +
      + + +
      + <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.cancel"), admin_dmptemplate_path(@dmptemplate), :class => "btn cancel" %> +
      + + <%end%> +
      +
      +
      +
      + <%= tinymce :content_css => asset_path("application.css") %> \ No newline at end of file diff --git a/app/views/dmptemplates/admin_index.html.erb b/app/views/dmptemplates/admin_index.html.erb index 5440687..64a2097 100644 --- a/app/views/dmptemplates/admin_index.html.erb +++ b/app/views/dmptemplates/admin_index.html.erb @@ -5,7 +5,7 @@

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

      @@ -34,8 +34,8 @@ - <% @dmptemplates_own.each do |org_template| %> - + <% @dmptemplates_own.each do |org_template| %> + <%= org_template.title%> @@ -64,28 +64,28 @@ <% b_label = t('helpers.submit.edit')%> <%else%> <% b_label = t('helpers.view')%> - <%end%> + <%end%> <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%> - <%end%> + <%end%> - -<%end%> + +<%end%>
      -<% if current_user.org_type != t("helpers.org_type.funder") then %> +<% if current_user.org_type != constant("organisation_types.funder") then %>

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

      + <% if @dmptemplates_funders.count > 0 then %> - + @@ -97,8 +97,8 @@ - - <% @dmptemplates_funders.each do |org_template| %> + + <% @dmptemplates_funders.each do |org_template| %> <% if org_template.published? ||org_template.has_customisations?(current_user.organisation_id, org_template) then %> <%end%> - <%end%> + <%end%>
      @@ -126,28 +126,28 @@ <%end%> <%end%> <%= l last_updated.to_date, :formats => :short %> - + <%if current_user.is_org_admin? then%> - <% if org_template.org_type == t("helpers.org_type.funder") then %> + <% if org_template.org_type == constant("organisation_types.funder") then %> <%if org_template.has_customisations?(current_user.organisation_id, org_template) then%> <% b_label = t("org_admin.templates.edit_customisation")%> - <%else%> + <%else%> <% b_label = t("org_admin.templates.customise")%> - <%end%> + <%end%> <%else%> <% b_label = t("helpers.submit.edit")%> - <%end%> + <%end%> <%else%> <% b_label = t("helpers.view")%> - <%end%> + <%end%> <%= link_to b_label, admin_template_dmptemplate_path(org_template), :class => "dmp_table_link"%>
      <%end%> -<%end%> \ No newline at end of file +<%end%> diff --git a/app/views/dmptemplates/admin_new.html.erb b/app/views/dmptemplates/admin_new.html.erb index 07b75a7..798f855 100644 --- a/app/views/dmptemplates/admin_new.html.erb +++ b/app/views/dmptemplates/admin_new.html.erb @@ -1,48 +1,48 @@ -<%= stylesheet_link_tag "admin" %> -<% javascript "admin.js" %> - -

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

      - -
      -
      - -
      - <%= raw t("org_admin.templates.create_new_template_text_html")%> -
      - <%= form_for :dmptemplate, :url => {:action => "admin_create"} do |f| %> - - - - - - - - - - -
      <%= t("org_admin.templates.title_label") %><%= f.text_field :title, :as => :string, - :class => "text_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.title_help_text") %>
      <%= t("org_admin.templates.desc_label") %>
      - <%= text_area_tag("template-desc", "", class: "tinymce") %> -
      -
      - <%= link_to( image_tag("help_button.png"), "#", :class => "template_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.template_desc_help_text_html"))%> -
      -
      - -
      - <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), admin_index_dmptemplate_path, :class => "btn cancel" %> -
      -
      - <%end%> -
      -
      +<%= stylesheet_link_tag "admin" %> +<% javascript "admin.js" %> + +

      + <%= t("org_admin.templates.new_label") %> + +
      + <%= link_to t("org_admin.templates.view_all_templates"), + admin_index_dmptemplate_path, + :class => "btn btn-primary" %> +
      +

      + +
      +
      + +
      + <%= raw t("org_admin.templates.create_new_template_text_html")%> +
      + <%= form_for :dmptemplate, :url => {:action => "admin_create"} do |f| %> + + + + + + + + + + +
      <%= t("org_admin.templates.title_label") %><%= f.text_field :title, :as => :string, + :class => "text_field has-tooltip", "data-toggle" => "tooltip", "title" => t("org_admin.templates.title_help_text") %>
      <%= t("org_admin.templates.desc_label") %>
      + <%= text_area_tag("template-desc", "", class: "tinymce") %> +
      +
      + <%= link_to( image_tag("help_button.png"), "#", :class => "template_desc_popover", :rel => "popover", "data-html" => "true", "data-content" => t("org_admin.template_desc_help_text_html"))%> +
      +
      + +
      + <%= f.submit t("helpers.submit.save"), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.cancel"), admin_index_dmptemplate_path, :class => "btn cancel" %> +
      +
      + <%end%> +
      +
      <%= tinymce :content_css => asset_path("application.css") %> \ No newline at end of file diff --git a/app/views/dmptemplates/admin_phase.html.erb b/app/views/dmptemplates/admin_phase.html.erb index 0621f7e..18ee0a2 100644 --- a/app/views/dmptemplates/admin_phase.html.erb +++ b/app/views/dmptemplates/admin_phase.html.erb @@ -9,7 +9,7 @@ <%= link_to t("org_admin.templates.view_all_templates"), admin_index_dmptemplate_path, :class => 'btn btn-primary' %> -
      +
      @@ -20,62 +20,61 @@
      - +
      - +
      <%= render :partial => "show_phase", locals: {phase: @phase}%>
      - <% if @phase.dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> + <% if @phase.dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %> - + <%= render :partial => "versions_table", locals: {phase: @phase}%> - <%end%> - + <%end%> + - <% if @edit == "false" || (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder")) then%> + <% if @edit == "false" || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder")) then%> <%= render :partial => 'show_version', locals: {version: @version}%> - <%elsif @edit == "true" || current_user.org_type == t("helpers.org_type.funder") then %> + <%elsif @edit == "true" || current_user.org_type == constant("organisation_types.funder") then %> <%= render :partial => 'edit_version', locals: {version: @version, edit: @edit, phase: @phase} %> - <%end%> + <%end%>
      - + <% @sections.order("number ASC").each do |section| %> - <%if (@edit == "true" && section.organisation_id == current_user.organisation_id) || - (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && section.organisation_id == current_user.organisation_id && current_user.org_type != t("helpers.org_type.funder"))then%> + <%if (@edit == "true" && section.organisation_id == current_user.organisation_id) || + (@phase.dmptemplate.org_type == constant("organisation_types.funder") && section.organisation_id == current_user.organisation_id && current_user.org_type != constant("organisation_types.funder"))then%> <%= render :partial => 'edit_section', locals: {section: section, edit: @edit, phase: @phase, version: @version} %> <%elsif (section.organisation_id == @phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%> <%= render :partial => 'show_section', locals: {section: section}%> - <%end%> + <%end%> <% end %> - -
      + +
      - - + + - <% if !@version.published? || (@phase.dmptemplate.org_type == t("helpers.org_type.funder") && current_user.org_type != t("helpers.org_type.funder"))then %> - + <% if !@version.published? || (@phase.dmptemplate.org_type == constant("organisation_types.funder") && current_user.org_type != constant("organisation_types.funder"))then %> + - +
      - <%= link_to t('org_admin.add_section_label'),'#', :id => 'add_section_button', :class =>'btn btn-primary' %> + <%= link_to t('org_admin.add_section_label'),'#', :id => 'add_section_button', :class =>'btn btn-primary' %>
      -
      - <%end%> - - -<%= tinymce :content_css => asset_path('application.css') %> \ No newline at end of file + + <%end%> + + diff --git a/app/views/dmptemplates/admin_previewphase.html.erb b/app/views/dmptemplates/admin_previewphase.html.erb index 3cf5b64..12c2507 100644 --- a/app/views/dmptemplates/admin_previewphase.html.erb +++ b/app/views/dmptemplates/admin_previewphase.html.erb @@ -1,64 +1,64 @@ -<%- model_class = Phase -%> -<%= stylesheet_link_tag "admin" %> - -

      - <%= @version.phase.dmptemplate.title %> - -
      - <%= link_to t("org_admin.templates.back_to_edit_phase_label"), - admin_phase_dmptemplate_path(:id => @version.phase_id, :version_id => @version.id, :edit => "true"), - :class => 'btn btn-primary' %> - <%= link_to t("org_admin.templates.view_all_templates"), - admin_index_dmptemplate_path, - :class => 'btn btn-primary' %> -
      -

      - -
      - - -<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @version.phase.dmptemplate, active: @version.phase_id} %> - - -
      -
      - <% sections = @version.sections %> - <% sections.order(:number).each do |section| %> - <%if (section.organisation_id == @version.phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%> - -
      -
      - -
      - <%= section.title %> -
      - - - -       -
      -
      -
      - <%= raw section.description %> -
      -
      - <% section.questions.order("number").each do |question| %> - <% last_question_id = section.questions.order("number DESC").first.id%> - - - <%= render :partial => 'preview_question', locals: {question: question}%> - - <% if last_question_id == question.id then %> -
      - <% else %> -
      - <% end %> - - <%end%> -
      -
      -
      - <%end%> - <%end%> -
      +<%- model_class = Phase -%> +<%= stylesheet_link_tag "admin" %> + +

      + <%= @version.phase.dmptemplate.title %> + +
      + <%= link_to t("org_admin.templates.back_to_edit_phase_label"), + admin_phase_dmptemplate_path(:id => @version.phase_id, :version_id => @version.id, :edit => "true"), + :class => 'btn btn-primary' %> + <%= link_to t("org_admin.templates.view_all_templates"), + admin_index_dmptemplate_path, + :class => 'btn btn-primary' %> +
      +

      + +
      + + +<%= render :partial => "admin_nav_tabs", locals: {dmptemplate: @version.phase.dmptemplate, active: @version.phase_id} %> + + +
      +
      + <% sections = @version.sections %> + <% sections.order(:number).each do |section| %> + <%if (section.organisation_id == @version.phase.dmptemplate.organisation_id ) || ( section.organisation_id == current_user.organisation_id) then%> + +
      +
      + +
      + <%= section.title %> +
      + + + +       +
      +
      +
      + <%= raw section.description %> +
      +
      + <% section.questions.order("number").each do |question| %> + <% last_question_id = section.questions.order("number DESC").first.id%> + + + <%= render :partial => 'preview_question', locals: {question: question}%> + + <% if last_question_id == question.id then %> +
      + <% else %> +
      + <% end %> + + <%end%> +
      +
      +
      + <%end%> + <%end%> +
      \ No newline at end of file diff --git a/app/views/dmptemplates/admin_template.html.erb b/app/views/dmptemplates/admin_template.html.erb index 2d36206..642fb15 100644 --- a/app/views/dmptemplates/admin_template.html.erb +++ b/app/views/dmptemplates/admin_template.html.erb @@ -8,7 +8,7 @@ <%= link_to t("org_admin.templates.view_all_templates"), admin_index_dmptemplate_path, :class => 'btn btn-primary' %> -
      +
      @@ -19,14 +19,14 @@
      - <% if @dmptemplate.org_type != t("helpers.org_type.funder") || current_user.org_type == t("helpers.org_type.funder") then %> + <% if @dmptemplate.org_type != constant("organisation_types.funder") || current_user.org_type == constant("organisation_types.funder") then %> - <%end%> +
      + <%end%>
      <%= render :partial => "show_template", locals: {dmptemplate: @dmptemplate}%> -
      +
      <% if !@dmptemplate.phases.nil? then %> @@ -35,7 +35,7 @@ <%= render :partial => 'show_phases_sections', locals: {phase: phase}%> <%end%> - <%else%> + <%else%> <% @dmptemplate.phases.order(:number).each do |phase| %>
      @@ -52,10 +52,10 @@
      - - <%end%> - <%end%> - <%end%> - + + <%end%> + <%end%> + <%end%> + -<%= tinymce :content_css => asset_path('application.css') %> \ No newline at end of file +<%= tinymce :content_css => asset_path('application.css') %> diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb index 88303f2..2ea27f8 100644 --- a/app/views/guidance_groups/admin_edit.html.erb +++ b/app/views/guidance_groups/admin_edit.html.erb @@ -1,97 +1,97 @@ -<%= stylesheet_link_tag "admin" %> -<% javascript 'admin.js' %> - -

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

      - -
      - -
      - -
      - <%= form_for(@guidance_group, :url => admin_update_guidance_group_path(@guidance_group), :html => {:method => :put}) do |f| %> - - - - - - - - - - - - <% if @guidance_group.published == true then %> - - - - - <% end %> - - - - - - -
      <%= t('org_admin.guidance_group.name_label') %> -
      - <%= f.text_field :name, - :as => :string, - :class => 'text_field' %> - -
      -
      - <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_title_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.title_help_text_html')) %> -
      -
      <%= t('org_admin.guidance.template') %> -
      - <% if @guidance_group.dmptemplate_ids == [] then %> - <% default_select = "" %> - <% else %> - <% default_select = @guidance_group.dmptemplate_ids %> - <% end %> - <%= f.select :dmptemplate_ids, options_for_select( - [['All templates', ""]].concat(Dmptemplate.funders_and_own_templates(current_user.organisation_id).collect { |g| [g.title, g.id] }), :selected => default_select), {}, - {:prompt => false, :multiple => true} %> -
      -
      - <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_template_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.template_help_text_html')) %> -
      - -
      <%= t('org_admin.templates.published_label') %> -
      - <%= f.check_box :published %> -
      -
      - -
      -
      <%= t('org_admin.guidance_group.subset') %> -
      - <%= f.check_box :optional_subset %> <%= t('org_admin.guidance_group.subset_eg') %> -
      -
      - <%= link_to(image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.subset_option_help_text')) %> -
      -
      - - - -
      - <%= f.submit t('helpers.submit.save'), :class => 'btn btn-primary' %> - <% if @guidance_group.published == false then %> - <%= f.submit t('helpers.submit.publish'), :name => "save_publish", :class => "btn btn-primary" %> - <% end %> - <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> -
      - -
      - <% end %> -
      -
      +<%= stylesheet_link_tag "admin" %> +<% javascript 'admin.js' %> + +

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

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

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

      - -
      - -
      - -
      - <%= form_for :guidance_group, :url => {:action => "admin_create"} do |f| %> - - - - - - - - - - - - - - - -
      <%= t('org_admin.guidance_group.name_label') %>
      - <%= f.text_field :name, - :as => :string, - :class => "text_field" %> -
      -
      - <%= link_to( image_tag("help_button.png"), "#", :class => 'guidance_group_title_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t("org_admin.guidance_group.title_help_text_html"))%> -
      - -
      <%= t("org_admin.guidance.template") %>
      - <%= f.select :dmptemplate_ids, options_for_select( - [['All templates', ""]].concat( Dmptemplate.funders_and_own_templates(current_user.organisation_id).collect{ |g| [g.title, g.id] })),{} , - {:prompt => false , :multiple => true}%> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_template_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.template_help_text_html'))%> -
      -
      <%= t('org_admin.guidance_group.subset') %>
      - <%= f.check_box :optional_subset %> <%= t('org_admin.guidance_group.subset_eg') %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.subset_option_help_text'))%> -
      - -
      - - - -
      - <%= f.submit t("helpers.submit.save"), :name => "draft", :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel btn-secondary" %> -
      - -
      - <%end%> -
      -
      +<%= stylesheet_link_tag "admin" %> +<% javascript 'admin.js' %> + +

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

      + +
      + +
      + +
      + <%= form_for :guidance_group, :url => {:action => "admin_create"} do |f| %> + + + + + + + + + + + + + + + +
      <%= t('org_admin.guidance_group.name_label') %>
      + <%= f.text_field :name, + :as => :string, + :class => "text_field" %> +
      +
      + <%= link_to( image_tag("help_button.png"), "#", :class => 'guidance_group_title_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t("org_admin.guidance_group.title_help_text_html"))%> +
      + +
      <%= t("org_admin.guidance.template") %>
      + <%= f.select :dmptemplate_ids, options_for_select( + [['All templates', ""]].concat( Dmptemplate.funders_and_own_templates(current_user.organisation_id).collect{ |g| [g.title, g.id] })),{} , + {:prompt => false , :multiple => true}%> +
      +
      + <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_template_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.template_help_text_html'))%> +
      +
      <%= t('org_admin.guidance_group.subset') %>
      + <%= f.check_box :optional_subset %> <%= t('org_admin.guidance_group.subset_eg') %> +
      +
      + <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance_group.subset_option_help_text'))%> +
      + +
      + + + +
      + <%= f.submit t("helpers.submit.save"), :name => "draft", :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.cancel"), :back, :class => "btn cancel btn-secondary" %> +
      + +
      + <%end%> +
      +
      diff --git a/app/views/guidance_groups/admin_show.html.erb b/app/views/guidance_groups/admin_show.html.erb index fe641ab..a5998ec 100644 --- a/app/views/guidance_groups/admin_show.html.erb +++ b/app/views/guidance_groups/admin_show.html.erb @@ -1,92 +1,92 @@ -<%= stylesheet_link_tag "admin" %> - -

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

      - -
      - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      <%= t("org_admin.guidance_group.name_label") %><%= raw @guidance_group.name %>
      - <% if @guidance_group.dmptemplates.count == 1 then %> - <%= t("org_admin.guidance.template") %> - <% else %> - <%= t("org_admin.guidance.templates") %> - <% end %> - - <% i = 1 %> - <% if @guidance_group.dmptemplates.count == 0 then %> - <% list = Dmptemplate.funders_and_own_templates(current_user.organisation_id) %> - <% list.each do |tem| %> - <%= tem.title %> - <% if list.count > i then %> - , - <% i +=1 %> - <% end %> - <% end %> - <% else %> - <% @guidance_group.dmptemplates.each do |tem| %> - <%= tem.title %> - <% if @guidance_group.dmptemplates.count > i then %> - , - <% i +=1 %> - <% end %> - <% end %> - <% end %> -
      <%= t('org_admin.templates.published_label') %> - <% if @guidance_group.published.nil? || @guidance_group.published == false then %> - <%= t("helpers.no_label") %> - <% else %> - <%= t("helpers.yes_label") %> - <% end %> -
      <%= t("org_admin.guidance_group.subset") %> - <% if @guidance_group.optional_subset.nil? || @guidance_group.optional_subset == false then %> - <%= t('helpers.no_label') %> - <% else %> - <%= t('helpers.yes_label') %> - <% end %> -
      <%= t("org_admin.guidance.created") %><%= l @guidance_group.created_at.to_date, :formats => :short %>
      <%= t("org_admin.guidance.last_updated") %><%= l @guidance_group.updated_at.to_date, :formats => :short %>
      -
      - <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(@guidance_group.id), :class => "btn btn-primary" %> - <%= link_to t("helpers.submit.back"), :back, :class => "btn cancel" %> -
      -
      -
      +<%= stylesheet_link_tag "admin" %> + +

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

      + +
      + +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      <%= t("org_admin.guidance_group.name_label") %><%= raw @guidance_group.name %>
      + <% if @guidance_group.dmptemplates.count == 1 then %> + <%= t("org_admin.guidance.template") %> + <% else %> + <%= t("org_admin.guidance.templates") %> + <% end %> + + <% i = 1 %> + <% if @guidance_group.dmptemplates.count == 0 then %> + <% list = Dmptemplate.funders_and_own_templates(current_user.organisation_id) %> + <% list.each do |tem| %> + <%= tem.title %> + <% if list.count > i then %> + , + <% i +=1 %> + <% end %> + <% end %> + <% else %> + <% @guidance_group.dmptemplates.each do |tem| %> + <%= tem.title %> + <% if @guidance_group.dmptemplates.count > i then %> + , + <% i +=1 %> + <% end %> + <% end %> + <% end %> +
      <%= t('org_admin.templates.published_label') %> + <% if @guidance_group.published.nil? || @guidance_group.published == false then %> + <%= t("helpers.no_label") %> + <% else %> + <%= t("helpers.yes_label") %> + <% end %> +
      <%= t("org_admin.guidance_group.subset") %> + <% if @guidance_group.optional_subset.nil? || @guidance_group.optional_subset == false then %> + <%= t('helpers.no_label') %> + <% else %> + <%= t('helpers.yes_label') %> + <% end %> +
      <%= t("org_admin.guidance.created") %><%= l @guidance_group.created_at.to_date, :formats => :short %>
      <%= t("org_admin.guidance.last_updated") %><%= l @guidance_group.updated_at.to_date, :formats => :short %>
      +
      + <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(@guidance_group.id), :class => "btn btn-primary" %> + <%= link_to t("helpers.submit.back"), :back, :class => "btn cancel" %> +
      +
      +
      \ No newline at end of file diff --git a/app/views/guidances/admin_edit.html.erb b/app/views/guidances/admin_edit.html.erb index 0f2e0c8..e6a47f9 100644 --- a/app/views/guidances/admin_edit.html.erb +++ b/app/views/guidances/admin_edit.html.erb @@ -1,157 +1,157 @@ -<%= stylesheet_link_tag "admin" %> -<% javascript 'admin.js' %> - -

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

      - -
      - -
      - -
      - <%= form_for(@guidance, :url => admin_update_guidance_path(@guidance), :html => { :method => :put , :id => 'edit_guidance_form'}) do |f| %> - - - - - - - - - - - - - - - - - - - - -
      <%= t('org_admin.guidance.text_label') %>
      - <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_text_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.text_help_text_html'))%> -
      -
      -
      <%= t('org_admin.guidance.by_theme_or_by_question') %>
      - <% if !@guidance.question_id.nil? then %> - <% select_op = 2 %> - <% else%> - <% select_op = 1%> - <%end%> - <%= hidden_field 'select_op' , :value => select_op, :id => 'edit_guid_ques_flag' %> - - <%= select_tag "g_options", options_for_select({t('org_admin.guidance.by_themes_label') => 1, - t('org_admin.guidance.by_question_label') => 2}, select_op) %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_apply_to_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.apply_to_help_text_html'))%> -
      -
      - - - - -
      <%= t('org_admin.guidance.published') %>
      - <%= f.check_box :published , :as => :check_boxes%> -
      -
      - -
      -
      <%= t('org_admin.guidance.guidance_group_label') %>
      - <%= f.collection_select(:guidance_group_ids, - GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order('name ASC'), - :id, :name, {:prompt => false, :include_blank => 'None'}, {:multiple => false})%> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_select_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.guidance_group_select_help_text_html'))%> -
      -
      - -
      - - - -
      - <%= t('helpers.submit.save')%> - <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> -
      - -
      - <%= tinymce :content_css => asset_path('application.css') %> - <%end%> -
      -
      - - - - +<%= stylesheet_link_tag "admin" %> +<% javascript 'admin.js' %> + +

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

      + +
      + +
      + +
      + <%= form_for(@guidance, :url => admin_update_guidance_path(@guidance), :html => { :method => :put , :id => 'edit_guidance_form'}) do |f| %> + + + + + + + + + + + + + + + + + + + + +
      <%= t('org_admin.guidance.text_label') %>
      + <%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %> +
      +
      + <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_text_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.text_help_text_html'))%> +
      +
      +
      <%= t('org_admin.guidance.by_theme_or_by_question') %>
      + <% if !@guidance.question_id.nil? then %> + <% select_op = 2 %> + <% else%> + <% select_op = 1%> + <%end%> + <%= hidden_field 'select_op' , :value => select_op, :id => 'edit_guid_ques_flag' %> + + <%= select_tag "g_options", options_for_select({t('org_admin.guidance.by_themes_label') => 1, + t('org_admin.guidance.by_question_label') => 2}, select_op) %> +
      +
      + <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_apply_to_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.apply_to_help_text_html'))%> +
      +
      + + + + +
      <%= t('org_admin.guidance.published') %>
      + <%= f.check_box :published , :as => :check_boxes%> +
      +
      + +
      +
      <%= t('org_admin.guidance.guidance_group_label') %>
      + <%= f.collection_select(:guidance_group_ids, + GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order('name ASC'), + :id, :name, {:prompt => false, :include_blank => 'None'}, {:multiple => false})%> +
      +
      + <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_select_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.guidance_group_select_help_text_html'))%> +
      +
      + +
      + + + +
      + <%= t('helpers.submit.save')%> + <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> +
      + +
      + <%= tinymce :content_css => asset_path('application.css') %> + <%end%> +
      +
      + + + + diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index 596b023..f808526 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -1,174 +1,174 @@ -<%= stylesheet_link_tag "admin" %> -<% javascript "admin.js" %> - - -

      - <%= t("org_admin.guidance_group.guidance_group_list") %> -

      - -
      - <%= raw t("org_admin.guidance_group.guidance_group_text_html")%> -
      -
      -
      - <%= link_to t("org_admin.guidance_group.add_guidance_group"), admin_new_guidance_group_path(), :class => "btn btn-primary" %> -
      -
      - - -<% if @guidance_groups.count > 0 then%> - - - - - - - - - - - - - <% !@guidance_groups.each do |guidance_gr| %> - - - <% guidance_group_temp = guidance_gr.dmptemplate_ids %> - <% if guidance_group_temp != [] then %> - - <%else%> - - <%end%> - - - - - - - - <%end%> - -
      <%= t("org_admin.guidance_group.name_label") %><%= t("org_admin.guidance.template") %><%= t("org_admin.guidance.published") %><%= t("org_admin.guidance_group.subset") %><%= t("org_admin.guidance.last_updated") %><%= t("org_admin.guidance.actions") %>
      - <%= guidance_gr.name %> - - <% i = 1 %> - <% guidance_group_temp.each do |t| %> - <% temp = Dmptemplate.find(t) %> - <%= temp.title %> - - <% if guidance_group_temp.count > i then%> - , - <% i +=1 %> - <% end %> - <%end%> - - <%= t("org_admin.guidance_group.all_temp")%> - - <%if guidance_gr.published.nil? || guidance_gr.published == false then%> - <%= t("helpers.no_label")%> - <%else%> - <%= t("helpers.yes_label")%> - <%end%> - - <%if guidance_gr.optional_subset.nil? || guidance_gr.optional_subset == false then%> - <%= t("helpers.no_label")%> - <%else%> - <%= t("helpers.yes_label")%> - <%end%> - - <%= l guidance_gr.updated_at.to_date, :formats => :short %> - - <%= link_to t("helpers.view"), admin_show_guidance_group_path(guidance_gr), :class => "dmp_table_link"%>
      - <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(guidance_gr), :class => "dmp_table_link"%>
      - <%= link_to t("helpers.submit.delete"), admin_destroy_guidance_group_path(guidance_gr), - :confirm => t("org_admin.guidance_group.delete_message", :guidance_group_name => guidance_gr.name ), :method => :delete, :class => "dmp_table_link"%> -
      -<%end%> - -
      -
      - -

      - <%= t("org_admin.guidance.guidance_list") %> -

      - -
      - <%= raw t("org_admin.guidance.guidance_text_html")%> -
      -
      - -
      - <%= link_to t("org_admin.guidance.add_guidance"), - admin_new_guidance_path(), - :class => "btn btn-primary" %> -
      -
      - -
      - - -<% if @guidances.count > 0 then%> - - - - - - - - - - - - - <% @guidances.each do |guidance| %> - <% if guidance.in_group_belonging_to?(current_user.organisation_id) then %> - - - <% if guidance.themes != [] then %> - - <%else%> - - <%end%> - <% if !guidance.question_id.nil? then %> - - <%else%> - - <%end%> - <% if guidance.guidance_groups != [] then %> - - <%else%> - - <%end%> - - - - <%end%> - <%end%> - -
      <%= t("org_admin.guidance.text_label") %><%= t("org_admin.guidance.themes_label") %><%= t("org_admin.guidance.question_label") %><%= t("org_admin.guidance.guidance_group_label") %><%= t("org_admin.guidance.last_updated") %><%= t("org_admin.guidance.actions") %>
      - <%= guidance.text.html_safe%> - - <% guidance.themes.each do |th| %> - <%= th.title %> - <%end%> - - - - - <%= raw guidance.question.text.truncate(70, omission: t('helpers.truncate_continued')) %> - - - - - <% guidance.guidance_groups.each do |p|%> - <%= p.name %> - <%end%> - - - - - <%= l guidance.updated_at.to_date, :formats => :short %> - - <%= link_to t("helpers.view"), admin_show_guidance_path(guidance), :class => "dmp_table_link"%>
      - <%= link_to t("helpers.submit.edit"), admin_edit_guidance_path(guidance), :class => "dmp_table_link"%>
      - <%= link_to t("helpers.submit.delete"), admin_destroy_guidance_path(guidance), - :confirm => t("org_admin.guidance.delete_message_html", :guidance_summary => truncate(sanitize(guidance.text,:tags => %w(br a)), :length => 20 , :omission => t('helpers.truncate_continued')) ), :method => :delete, :class => "dmp_table_link"%> -
      -<%end%> - +<%= stylesheet_link_tag "admin" %> +<% javascript "admin.js" %> + + +

      + <%= t("org_admin.guidance_group.guidance_group_list") %> +

      + +
      + <%= raw t("org_admin.guidance_group.guidance_group_text_html")%> +
      +
      +
      + <%= link_to t("org_admin.guidance_group.add_guidance_group"), admin_new_guidance_group_path(), :class => "btn btn-primary" %> +
      +
      + + +<% if @guidance_groups.count > 0 then%> + + + + + + + + + + + + + <% !@guidance_groups.each do |guidance_gr| %> + + + <% guidance_group_temp = guidance_gr.dmptemplate_ids %> + <% if guidance_group_temp != [] then %> + + <%else%> + + <%end%> + + + + + + + + <%end%> + +
      <%= t("org_admin.guidance_group.name_label") %><%= t("org_admin.guidance.template") %><%= t("org_admin.guidance.published") %><%= t("org_admin.guidance_group.subset") %><%= t("org_admin.guidance.last_updated") %><%= t("org_admin.guidance.actions") %>
      + <%= guidance_gr.name %> + + <% i = 1 %> + <% guidance_group_temp.each do |t| %> + <% temp = Dmptemplate.find(t) %> + <%= temp.title %> + + <% if guidance_group_temp.count > i then%> + , + <% i +=1 %> + <% end %> + <%end%> + + <%= t("org_admin.guidance_group.all_temp")%> + + <%if guidance_gr.published.nil? || guidance_gr.published == false then%> + <%= t("helpers.no_label")%> + <%else%> + <%= t("helpers.yes_label")%> + <%end%> + + <%if guidance_gr.optional_subset.nil? || guidance_gr.optional_subset == false then%> + <%= t("helpers.no_label")%> + <%else%> + <%= t("helpers.yes_label")%> + <%end%> + + <%= l guidance_gr.updated_at.to_date, :formats => :short %> + + <%= link_to t("helpers.view"), admin_show_guidance_group_path(guidance_gr), :class => "dmp_table_link"%>
      + <%= link_to t("helpers.submit.edit"), admin_edit_guidance_group_path(guidance_gr), :class => "dmp_table_link"%>
      + <%= link_to t("helpers.submit.delete"), admin_destroy_guidance_group_path(guidance_gr), + :confirm => t("org_admin.guidance_group.delete_message", :guidance_group_name => guidance_gr.name ), :method => :delete, :class => "dmp_table_link"%> +
      +<%end%> + +
      +
      + +

      + <%= t("org_admin.guidance.guidance_list") %> +

      + +
      + <%= raw t("org_admin.guidance.guidance_text_html")%> +
      +
      + +
      + <%= link_to t("org_admin.guidance.add_guidance"), + admin_new_guidance_path(), + :class => "btn btn-primary" %> +
      +
      + +
      + + +<% if @guidances.count > 0 then%> + + + + + + + + + + + + + <% @guidances.each do |guidance| %> + <% if guidance.in_group_belonging_to?(current_user.organisation_id) then %> + + + <% if guidance.themes != [] then %> + + <%else%> + + <%end%> + <% if !guidance.question_id.nil? then %> + + <%else%> + + <%end%> + <% if guidance.guidance_groups != [] then %> + + <%else%> + + <%end%> + + + + <%end%> + <%end%> + +
      <%= t("org_admin.guidance.text_label") %><%= t("org_admin.guidance.themes_label") %><%= t("org_admin.guidance.question_label") %><%= t("org_admin.guidance.guidance_group_label") %><%= t("org_admin.guidance.last_updated") %><%= t("org_admin.guidance.actions") %>
      + <%= guidance.text.html_safe%> + + <% guidance.themes.each do |th| %> + <%= th.title %> + <%end%> + + - + + <%= raw guidance.question.text.truncate(70, omission: t('helpers.truncate_continued')) %> + + - + + <% guidance.guidance_groups.each do |p|%> + <%= p.name %> + <%end%> + + - + + <%= l guidance.updated_at.to_date, :formats => :short %> + + <%= link_to t("helpers.view"), admin_show_guidance_path(guidance), :class => "dmp_table_link"%>
      + <%= link_to t("helpers.submit.edit"), admin_edit_guidance_path(guidance), :class => "dmp_table_link"%>
      + <%= link_to t("helpers.submit.delete"), admin_destroy_guidance_path(guidance), + :confirm => t("org_admin.guidance.delete_message_html", :guidance_summary => truncate(sanitize(guidance.text,:tags => %w(br a)), :length => 20 , :omission => t('helpers.truncate_continued')) ), :method => :delete, :class => "dmp_table_link"%> +
      +<%end%> + diff --git a/app/views/guidances/admin_new.html.erb b/app/views/guidances/admin_new.html.erb index 94d90fe..9676554 100644 --- a/app/views/guidances/admin_new.html.erb +++ b/app/views/guidances/admin_new.html.erb @@ -1,127 +1,127 @@ -<%= stylesheet_link_tag "admin" %> -<% javascript 'admin.js' %> - -

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

      - -
      -
      - -
      - <%= form_for :guidance, :url => {:action => 'admin_create'}, :html => {:id => 'new_guidance_form'} do |f| %> - - - - - - - - - - - - - - - - - -
      <%= t('org_admin.guidance.text_label') %>
      - <%= text_area_tag("guidance-text", "", class: "tinymce") %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_text_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.text_help_text_html'))%> -
      -
      -
      <%= t('org_admin.guidance.by_theme_or_by_question') %>
      - <%= select_tag "g_options", options_for_select([[t('org_admin.guidance.by_themes_label'), 1], - [t('org_admin.guidance.by_question_label'), 2]]) %> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_apply_to_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.apply_to_help_text_html'))%> -
      -
      - - - -
      <%= t('org_admin.guidance.published') %>
      - <%= f.check_box :published , :as => :check_boxes%> -
      -
      - -
      -
      <%= t('org_admin.guidance.guidance_group_label') %>
      - <%= f.collection_select(:guidance_group_ids, - GuidanceGroup.where("organisation_id = ?", current_user.organisation_id).order('name ASC'), - :id, :name, {:prompt => false, :include_blank => 'None'}, {:multiple => false})%> -
      -
      - <%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_select_popover', :rel => "popover", 'data-html' => "true", 'data-content' => t('org_admin.guidance.guidance_group_select_help_text_html'))%> -
      -
      - -
      - - - -
      - <%= t("helpers.submit.save")%> - - <%= link_to t('helpers.submit.cancel'), :back, :class => 'btn cancel' %> -
      - -
      - <%= tinymce :content_css => asset_path('application.css') %> - <%end%> -
      -
      - - - -