biovision-base 0.15.180502 → 0.17.180619

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1498261b5c92964dc68ed231731b1edbe106d0b41e1cae16c10527ec1891d4
-  data.tar.gz: e4968f3a7396a9d54d95840ea4435a6198c85a12db44519b06738e7261c12016
+  metadata.gz: d27941a438886a58f345aa63fc7cb640322245be245db3ce049955f2c5e5c63c
+  data.tar.gz: dd9e9b5ec6f04673bc2946b6aeca0b0ac0235df23b83e32771553e995e6f2f53
 SHA512:
-  metadata.gz: 1b96d1c6787eea0003c5e8d0c5341385761a75348944d9d7212ef31e7b03b9575ff43b8feb88b648d1e492abde88549bb12a41724714ca456be99b0020edc1be
-  data.tar.gz: f35baf097a33a05fa6c1deaf62823a92657942f40f7e0bdd41dfd832869cad03b17a57d7af2bf2fa9c0d2643ab4ea28d19b1a9e90609b90af6c02a6cee1d2751
+  metadata.gz: ef9c838486e81589fb35a1cbf066f7d19d91c0147084360ab7cd5fdbab460898b3adca97d3805ea03547864021d3d5fa091dfe368ced7691ac19436d8b46e806
+  data.tar.gz: 5ab35349100232156ac728f4f6d08a0c785529a7d414c8764f46d05d3aca1e57aaaea71416afb0063c3b495a0b32546695a5832a32c69da0f55c68318e3e2cd0

data/app/assets/images/biovision/base/placeholders/user.svg

@@ -1,21 +1,4 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="480px" height="480px" viewBox="-216 -216 480 480">
-<path d="M23.25,259C-106.952,259-212.5,153.446-212.5,23.25c0-130.204,105.548-235.75,235.75-235.75
-	C153.446-212.5,259-106.954,259,23.25C259,153.446,153.446,259,23.25,259z M153.842,191.643c-1.751-2.588-3.987-5.811-5.767-8.333
-	c-3.114-4.428-6.227-8.835-9.011-13.221c-0.133-0.197-15.5-20.829-70.909-23.351c-19.272,0-33.282-14.461-33.316-34.425
-	l-0.361-10.48c0-1.514-0.177,1.666,0,0V90.606L45.704,79.38c8.2-3.803,18.638-10.206,26.88-16.433l1.522-1.041
-	c6.525-4.145,15.635-12.871,16.501-16.205l0.406-4.275c4.188-21.59,10.82-60.861,10.82-74.308c0-52.874-25.71-78.583-78.584-78.583
-	c-53.604,0-78.583,24.969-78.583,78.583c0,13.809,6.633,52.886,10.81,74.264l0.394,3.97c0.708,3.507,8.969,11.818,16.27,16.399
-	l1.097,0.703c8.847,6.183,19.421,13.068,27.56,16.926l11.227,11.227v11.227c0.158,1.557,0-1.645,0,0l-0.373,10.48
-	c0,19.932-13.983,34.402-32.364,34.402c-0.01,0-0.021,0-0.033,0c-55.637,2.259-71.77,23.307-71.791,23.307
-	c-2.83,4.452-5.927,8.859-9.062,13.31c-1.759,2.5-3.985,5.723-5.755,8.311c36.111,28.044,81.33,44.903,130.591,44.903
-	C72.499,236.546,117.729,219.687,153.842,191.643z M23.25-190.049c-117.797,0-213.297,95.5-213.297,213.299
-	c0,60.472,25.259,114.915,65.674,153.725c4.287-6.338,8.87-12.674,12.909-19.011c0,0,18.748-30.796,89.811-33.679
-	c7.241,0,10.854-4.735,10.854-11.972h0.011c-0.011-5.843-0.011-10.48-0.011-10.48c0-1.458-0.237-2.774-0.303-4.188
-	c-8.129-3.837-17.557-9.144-28.503-16.773c0,0-26.942-16.576-26.942-35.171c0,0-11.226-57.429-11.226-78.583
-	c0-52.134,22.293-101.035,101.036-101.035c77.684,0,101.035,48.9,101.035,101.035c0,20.634-11.228,78.583-11.228,78.583
-	c0,18.09-26.937,35.171-26.937,35.171c-10.721,8.091-20.226,13.495-28.545,17.365c-0.067,1.216-0.265,2.347-0.265,3.596
-	c0,0-0.012,4.638-0.012,10.48h0.012c-0.021,7.236,3.597,11.972,10.832,11.972c72.114,3.234,89.808,33.679,89.808,33.679
-	c4.036,6.337,8.618,12.673,12.893,19.011c40.425-38.81,65.691-93.253,65.691-153.725C236.547-94.549,141.05-190.049,23.25-190.049z"
-      fill="#aaa"
-	/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" x="0px" y="0px" width="80px" height="80px" viewBox="0 0 80 80" xmlns="http://www.w3.org/2000/svg" xmlns:bx="https://boxy-svg.com">
+  <path d="M 40 80 C 17.908 80 0 62.091 0 40 C 0 17.908 17.908 0 40 0 C 62.091 0 80 17.908 80 40 C 80 62.091 62.091 80 40 80 Z M 62.158 68.571 C 61.861 68.132 61.481 67.585 61.179 67.158 C 60.651 66.406 60.123 65.659 59.65 64.914 C 59.628 64.881 57.02 61.38 47.619 60.952 C 44.349 60.952 41.972 58.499 41.966 55.111 L 41.905 53.333 C 41.905 53.076 41.875 53.616 41.905 53.333 L 41.905 51.428 L 43.81 49.524 C 45.201 48.878 46.972 47.792 48.371 46.735 L 48.629 46.559 C 49.736 45.856 51.282 44.375 51.429 43.809 L 51.497 43.084 C 52.208 39.421 53.333 32.758 53.333 30.476 C 53.333 21.505 48.971 17.143 40 17.143 C 30.905 17.143 26.667 21.379 26.667 30.476 C 26.667 32.819 27.792 39.449 28.501 43.076 L 28.568 43.75 C 28.688 44.345 30.089 45.755 31.328 46.533 L 31.514 46.652 C 33.015 47.701 34.809 48.869 36.19 49.524 L 38.095 51.429 L 38.095 53.333 C 38.122 53.598 38.095 53.054 38.095 53.333 L 38.032 55.112 C 38.032 58.493 35.659 60.949 32.541 60.949 C 32.539 60.949 32.537 60.949 32.535 60.949 C 23.095 61.332 20.358 64.903 20.354 64.903 C 19.874 65.659 19.349 66.406 18.817 67.161 C 18.518 67.586 18.141 68.133 17.84 68.572 C 23.967 73.33 31.64 76.19 39.998 76.19 C 48.356 76.19 56.03 73.33 62.158 68.571 Z M 40 3.809 C 20.013 3.809 3.81 20.013 3.81 40 C 3.81 50.26 8.095 59.498 14.953 66.083 C 15.68 65.007 16.458 63.932 17.143 62.857 C 17.143 62.857 20.324 57.632 32.381 57.143 C 33.61 57.143 34.223 56.339 34.223 55.111 L 34.225 55.111 C 34.223 54.12 34.223 53.333 34.223 53.333 C 34.223 53.086 34.183 52.863 34.171 52.623 C 32.792 51.972 31.193 51.071 29.335 49.777 C 29.335 49.777 24.764 46.964 24.764 43.809 C 24.764 43.809 22.859 34.065 22.859 30.476 C 22.859 21.63 26.642 13.333 40.002 13.333 C 53.183 13.333 57.145 21.63 57.145 30.476 C 57.145 33.977 55.24 43.809 55.24 43.809 C 55.24 46.879 50.669 49.777 50.669 49.777 C 48.85 51.15 47.238 52.067 45.826 52.723 C 45.815 52.929 45.781 53.121 45.781 53.333 C 45.781 53.333 45.779 54.12 45.779 55.111 L 45.781 55.111 C 45.778 56.339 46.392 57.143 47.619 57.143 C 59.855 57.691 62.857 62.857 62.857 62.857 C 63.542 63.932 64.319 65.007 65.044 66.083 C 71.903 59.498 76.19 50.26 76.19 40 C 76.19 20.013 59.987 3.809 40 3.809 Z" fill="#aaa" bx:origin="0 0"/>
+</svg>

data/app/assets/javascripts/biovision/base/biovision-sliders.js

@@ -23,7 +23,30 @@ Biovision.sliders = {
                 li.style.opacity = '0';
                 setTimeout(move, delay);
             }
-        }
+        },
+        slide: {
+            left: function (list, delay) {
+                const li = list.querySelector('li:last-of-type');
+                const elementWidth = li.offsetWidth;
+                const restore_style = function () {
+                    li.style.marginLeft = '';
+                };
+
+                li.style.marginLeft = -elementWidth + 'px';
+                list.prepend(li);
+                setTimeout(restore_style, delay);
+            },
+            right: function (list, delay) {
+                const li = list.querySelector('li:first-of-type');
+                const elementWidth = li.offsetWidth;
+                const move = function () {
+                    list.append(li);
+                    li.style.marginLeft = '';
+                };
+                li.style.marginLeft = -elementWidth + 'px';
+                setTimeout(move, delay);
+            }
+        },
     },
     initialize: function (slider) {
         const delay = slider.getAttribute('data-delay') || 125;

data/app/assets/javascripts/biovision/base/biovision.js

@@ -100,6 +100,13 @@ const Biovision = {
 
         return request;
     },
+    jsonAjaxRequest: function (method, url, onSuccess, onFailure) {
+        const request = Biovision.new_ajax_request(method, url, onSuccess, onFailure);
+
+        request.setRequestHeader('Content-Type', 'application/json');
+
+        return request;
+    },
     handle_ajax_failure: function (response) {
         console.log('AJAX failed', this);
         if (response.hasOwnProperty('responseJSON')) {
@@ -187,7 +194,7 @@ const Biovision = {
                                 const errors = response.meta.errors;
 
                                 if (errors.hasOwnProperty(key)) {
-                                    container.innerHTML = errors[key];
+                                    container.innerHTML = errors[key].join('; ');
                                     container.classList.remove('hidden');
                                 } else {
                                     container.classList.add('hidden');
@@ -198,12 +205,27 @@ const Biovision = {
                 }
             });
 
-            request.send(new FormData(form));
+            const data = new window.FormData();
+            Array.from((new FormData(form)).entries()).forEach(function (entry) {
+                const value = entry[1];
+
+                if (value instanceof window.File && value.name === '' && value.size === 0) {
+                    data.append(entry[0], new window.Blob([]), '');
+                } else {
+                    if (entry[0] !== '_method') {
+                        data.append(entry[0], value);
+                    }
+                }
+            });
+
+            request.send(data);
         };
 
-        form.querySelectorAll('[data-check]').forEach(function (element) {
-            element.addEventListener('blur', perform_check);
-        });
+        if (url.length) {
+            form.querySelectorAll('[data-check]').forEach(function (element) {
+                element.addEventListener('blur', perform_check);
+            });
+        }
     },
     show_list_of_errors: function (entity_name, list) {
         const form = document.getElementById(entity_name + '-form');

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -4,6 +4,7 @@
 
 html {
   font: 10px $font-family-main;
+  height: 100%;
   margin: 0;
   padding: 0;
   -webkit-text-size-adjust: none;
@@ -58,7 +59,7 @@ article {
 button,
 input,
 textarea {
-  font-size: $font-size-normal;
+  font-size: inherit;
 }
 
 ul.actions {
@@ -307,10 +308,12 @@ form {
 
   > * {
     bottom: 0;
+    height: 100%;
     left: 0;
     position: absolute;
     right: 0;
     top: 0;
+    width: 100%;
   }
 
   &::before {
@@ -342,3 +345,7 @@ form {
     padding-top: 50%;
   }
 }
+
+input.control:not(:checked) + div {
+  display: none;
+}

data/app/assets/stylesheets/biovision/base/default.scss

@@ -1,11 +1,11 @@
 $font-family-main: "Roboto", sans-serif !default;
 $font-family-heading: $font-family-main !default;
 
-$font-size-large: 2rem !default;
-$font-size-increased: 1.6rem !default;
-$font-size-normal: 1.4rem !default;
-$font-size-decreased: 1.2rem !default;
-$font-size-small: 1rem !default;
+$font-size-large: 2.4rem !default;
+$font-size-increased: 1.8rem !default;
+$font-size-normal: 1.6rem !default;
+$font-size-decreased: 1.3rem !default;
+$font-size-small: 1.1rem !default;
 
 $content-width: 100rem !default;
 $content-width-min: 32rem !default;
@@ -32,3 +32,11 @@ $background-footer: #fff !default;
 $link-color: rgb(20, 127, 255) !default;
 $link-color-visited: rgb(20, 77, 250) !default;
 $link-color-hover: rgb(255, 77, 20) !default;
+
+:root {
+  --font-size-large: #{$font-size-large};
+  --font-size-increased: #{$font-size-increased};
+  --font-size-normal: #{$font-size-normal};
+  --font-size-decreased: #{$font-size-decreased};
+  --font-size-small: #{$font-size-small};
+}

data/app/controllers/about_controller.rb

@@ -1,22 +1,27 @@
 class AboutController < ApplicationController
   # get /about
   def index
-    @editable_page = EditablePage.find_localized('about', locale)
+    @editable_page = EditablePage.localized_page('about', locale)
 
     render :editable
   end
 
   # get /tos
   def tos
-    @editable_page = EditablePage.find_localized('tos', locale)
+    @editable_page = EditablePage.localized_page('tos', locale)
 
     render :editable
   end
 
   # get /privacy
   def privacy
-    @editable_page = EditablePage.find_localized('privacy', locale)
+    @editable_page = EditablePage.localized_page('privacy', locale)
 
     render :editable
   end
+
+  # get /contact
+  def contact
+    @editable_page = EditablePage.localized_page('contact', locale)
+  end
 end

data/app/controllers/admin/editable_pages_controller.rb

@@ -1,9 +1,11 @@
 class Admin::EditablePagesController < AdminController
+  include EntityPriority
+
   before_action :set_entity, except: [:index]
 
   # get /admin/editable_pages
   def index
-    @collection = EditablePage.page_for_administration
+    @collection = EditablePage.list_for_administration
   end
 
   # get /admin/editable_pages/:id

data/app/controllers/editable_pages_controller.rb

@@ -8,7 +8,7 @@ class EditablePagesController < AdminController
 
   # post /editable_pages
   def create
-    @entity = EditablePage.new(creation_parameters)
+    @entity = EditablePage.new(entity_parameters)
     if @entity.save
       form_processed_ok(admin_editable_page_path(id: @entity.id))
     else
@@ -54,8 +54,4 @@ class EditablePagesController < AdminController
   def entity_parameters
     params.require(:editable_page).permit(EditablePage.entity_parameters)
   end
-
-  def creation_parameters
-    params.require(:editable_page).permit(EditablePage.creation_parameters)
-  end
 end

data/app/controllers/fallback_controller.rb

@@ -0,0 +1,11 @@
+class FallbackController < ApplicationController
+  # get (:editable_page_url)
+  def show
+    url = params[:editable_page_url]
+
+    @editable_page = EditablePage.fallback_page("/#{url}", locale)
+    if @editable_page.nil?
+      handle_http_404("Cannot find fallback page for url /#{url}")
+    end
+  end
+end

data/app/controllers/media_files_controller.rb

@@ -62,7 +62,15 @@ class MediaFilesController < ApplicationController
 
     @entity = MediaFile.create!(parameters)
 
-    render layout: false
+    if params[:CKEditorFuncNum]
+      render layout: false
+    else
+      render json: {
+        uploaded: 1,
+        fileName: File.basename(@entity.name),
+        url: @entity.file.medium.url
+      }
+    end
   end
 
   protected

data/app/controllers/my/profiles_controller.rb

@@ -2,10 +2,15 @@ class My::ProfilesController < ApplicationController
   include Authentication
 
   before_action :redirect_authorized_user, only: [:new, :create]
-  before_action :restrict_anonymous_access, except: [:new, :create]
+  before_action :restrict_anonymous_access, except: [:check, :new, :create]
 
   layout 'profile', only: [:show, :edit]
 
+  # post /my/profile/check
+  def check
+    @entity = User.new(creation_parameters)
+  end
+
   # get /my/profile/new
   def new
     @entity = User.new

data/app/models/concerns/checkable.rb

@@ -0,0 +1,20 @@
+# Adds method for validating model in controllers
+#
+# @author Maxim Khan-Magomedov <maxim.km@gmail.com>
+module Checkable
+  extend ActiveSupport::Concern
+
+  included do
+    # @param [Integer] id
+    # @param [Hash] parameters
+    def self.instance_for_check(id, parameters)
+      if id.blank?
+        entity = new(parameters)
+      else
+        entity = find_by(id: id)
+        entity.assign_attributes(parameters)
+      end
+      entity
+    end
+  end
+end

data/app/models/editable_page.rb

@@ -12,6 +12,7 @@ class EditablePage < ApplicationRecord
 
   belongs_to :language, optional: true
 
+  after_initialize :set_next_priority
   before_validation { self.slug = slug.strip unless slug.nil? }
   before_validation :normalize_priority
 
@@ -19,54 +20,70 @@ class EditablePage < ApplicationRecord
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :slug, maximum: SLUG_LIMIT
   validates_length_of :title, maximum: META_LIMIT
+  validates_length_of :image_alt_text, maximum: META_LIMIT
   validates_length_of :keywords, maximum: META_LIMIT
   validates_length_of :description, maximum: META_LIMIT
   validates_length_of :body, maximum: BODY_LIMIT
   validates_uniqueness_of :slug, scope: [:language_id]
 
+  scope :ordered_by_priority, -> { order('priority asc, slug asc') }
   scope :ordered_by_slug, -> { order('slug asc') }
   scope :with_slug_like, ->(slug) { where('slug ilike ?', "%#{slug}%") unless slug.blank? }
   scope :with_slug, ->(slug) { where('lower(slug) = lower(?)', slug) unless slug.blank? }
   scope :siblings, ->(s) { where(language: s.language, nav_group: s.nav_group) }
+  scope :list_for_administration, -> { ordered_by_priority }
 
   def self.page_for_administration
     ordered_by_slug
   end
 
   def self.entity_parameters
-    %i(image name title keywords description body language_id)
+    %i(body description image image_alt_text keywords language_id name nav_group title slug url)
   end
 
-  def self.creation_parameters
-    entity_parameters + %i(slug)
+  # @param [String] slug
+  # @param [String] language_code
+  # @deprecated use #localized_page
+  def self.find_localized(slug, language_code)
+    localized_page(slug, language_code)
   end
 
   # @param [String] slug
   # @param [String] language_code
-  def self.find_localized(slug, language_code = nil)
+  def self.localized_page(slug, language_code)
+    language = Language.find_by(code: language_code)
+    find_by(slug: slug, language: language) || find_by(slug: slug)
+  end
+
+  # @param [String] url
+  # @param [String] language_code
+  def self.fallback_page(url, language_code)
     language = Language.find_by(code: language_code)
-    criteria = { slug: slug }
-    instance = find_by(criteria.merge(language: language))
-    instance || find_by(criteria)
+    find_by(url: url, language: language) || find_by(url: url)
+  end
+
+  # @param [User] user
+  def editable_by?(user)
+    UserPrivilege.user_has_privilege?(user, :chief_editor)
   end
 
   # @param [Integer] delta
   def change_priority(delta)
     new_priority = priority + delta
-    adjacent     = self.class.siblings(self).find_by(priority: new_priority)
+    adjacent     = self.class.find_by(priority: new_priority)
     if adjacent.is_a?(self.class) && (adjacent.id != id)
       adjacent.update!(priority: priority)
     end
     update(priority: new_priority)
 
-    self.class.siblings(self).map { |e| [e.id, e.priority] }.to_h
+    self.class.ordered_by_priority.map { |e| [e.id, e.priority] }.to_h
   end
 
   private
 
   def set_next_priority
     if id.nil? && priority == 1
-      self.priority = self.class.siblings(self).maximum(:priority).to_i + 1
+      self.priority = self.class.maximum(:priority).to_i + 1
     end
   end
 

data/app/models/feedback_request.rb

@@ -5,13 +5,13 @@ class FeedbackRequest < ApplicationRecord
   EMAIL_LIMIT   = 250
   PHONE_LIMIT   = 30
   COMMENT_LIMIT = 5000
-  PER_PAGE      = 20
 
   toggleable :processed
 
   belongs_to :language, optional: true
   belongs_to :agent, optional: true
 
+  validates_acceptance_of :consent
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :phone, maximum: PHONE_LIMIT
   validates_length_of :comment, maximum: COMMENT_LIMIT
@@ -20,13 +20,14 @@ class FeedbackRequest < ApplicationRecord
 
   scope :recent, -> { order('id desc') }
   scope :unprocessed, -> { where(processed: false) }
+  scope :list_for_administration, -> { recent }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_administration.page(page)
   end
 
   def self.creation_parameters
-    %i(name email phone comment)
+    %i(comment consent email name phone)
   end
 end