biovision-base 0.8.170916 → 0.8.171029

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

@@ -1,13 +1,13 @@
 html {
-  background-image: linear-gradient(to bottom, #dedfe3 2%, #aeb3b9 95%), radial-gradient(33% 100%, rgba(255, 255, 255, 0.50) 0%, rgba(0, 0, 0, 0.50) 100%);
-  background-blend-mode: screen;
   background-attachment: fixed;
-  font: 400 10px $font-family-main;
+  background-blend-mode: screen;
+  background-image: linear-gradient(to bottom, #dedfe3 2%, #aeb3b9 95%), radial-gradient(farthest-corner at 33% 100%, rgba(255, 255, 255, .5) 0%, rgba(0, 0, 0, .5) 100%);
+  font: 300 10px $font-family-main;
   margin: 0;
   padding: 0;
-  -webkit-text-size-adjust: none;
   -moz-text-size-adjust: none;
   -ms-text-size-adjust: none;
+  -webkit-text-size-adjust: none;
 }
 
 * {
@@ -17,6 +17,7 @@ html {
 a:link,
 a:visited {
   color: $link-color;
+  font-weight: 400;
   text-decoration: none;
 }
 
@@ -29,6 +30,7 @@ img {
 }
 
 h1, h2, h3, h4, h5, h6 {
+  color: $text-color-heading;
   font-family: $font-family-heading;
   font-weight: 500;
   margin: 0;
@@ -121,6 +123,7 @@ article {
 
     &.preview {
       img {
+        box-shadow: $block-shadow;
         max-width: 32rem;
       }
     }
@@ -132,7 +135,7 @@ article {
 
     dt {
       border-top: $border-secondary;
-      font: 500 $font-size-increased $font-family-main;
+      font: 400 $font-size-increased $font-family-main;
       margin: .8rem 0 0 0;
       padding: .4rem 0;
     }
@@ -181,8 +184,6 @@ article {
 }
 
 nav.admin-breadcrumbs {
-  background: linear-gradient(to right, rgba(192, 230, 192, .125), rgba(255, 255, 255, 0));
-  border-left: .2rem solid rgba(80, 230, 80, .5);
   margin-bottom: .8rem;
   padding: .4rem;
 

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

@@ -337,7 +337,7 @@ ul.actions {
         background: $row-background-odd;
         list-style: none;
         margin: 0;
-        padding: .4rem;
+        padding: .8rem;
         position: relative;
 
         &:nth-last-of-type(even) {

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

@@ -17,11 +17,14 @@ $text-color-heading: #000 !default;
 $text-color-primary: rgb(28, 28, 28) !default;
 $text-color-secondary: #777 !default;
 
-$block-shadow: 0 0 .2rem .2rem rgba(0, 0, 0, .25) !default;
+$block-shadow: .2rem .2rem .4rem .2rem rgba(0, 0, 0, .125) !default;
 
-$border-primary: .1rem solid rgb(192, 192, 192) !default;
-$border-secondary: .1rem solid rgb(230, 230, 230) !default;
+$border-color-primary: rgb(192, 192, 192) !default;
+$border-color-secondary: rgb(230, 230, 230) !default;
+$border-primary: .1rem solid $border-color-primary !default;
+$border-secondary: .1rem solid $border-color-secondary !default;
 
+$background-body: #f4f4f4 linear-gradient(to top, #f4f4f4 0%, #dfdedc 100%) no-repeat center / cover !default;
 $background-header: #fff !default;
 $background-main: #fff !default;
 $background-footer: #fff !default;

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

@@ -1,3 +1,33 @@
+$font-family-heading: "Cormorant Garamond", serif !default;
+$font-family-main: "Roboto", sans-serif !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;
+
+$content-width: 100rem !default;
+$content-width-min: 32rem !default;
+
+$row-background-even: hsl(0, 0%, 95%) !default;
+$row-background-odd: hsl(0, 0%, 98%) !default;
+
+$text-color-heading: #000 !default;
+$text-color-primary: rgb(28, 28, 28) !default;
+$text-color-secondary: #777 !default;
+
+$block-shadow: .2rem .2rem .4rem .2rem rgba(0, 0, 0, .125) !default;
+
+$border-color-primary: rgb(192, 192, 192) !default;
+$border-color-secondary: rgb(230, 230, 230) !default;
+$border-primary: .1rem solid $border-color-primary !default;
+$border-secondary: .1rem solid $border-color-secondary !default;
+
+$link-color: rgb(20, 127, 255) !default;
+$link-color-visited: rgb(20, 77, 250) !default;
+$link-color-hover: rgb(255, 77, 20) !default;
+
 @import "biovision/base/toggleable";
 @import "biovision/base/buttons";
 @import "biovision/base/biovision";

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

@@ -1,3 +1,7 @@
+* {
+  box-sizing: border-box;
+}
+
 html {
   font: 10px $font-family-main;
   margin: 0;
@@ -7,10 +11,6 @@ html {
   -ms-text-size-adjust: none;
 }
 
-* {
-  box-sizing: border-box;
-}
-
 h1, h2, h3, h4, h6, h6 {
   color: $text-color-heading;
   font-family: $font-family-heading;
@@ -48,6 +48,7 @@ img {
 }
 
 body {
+  background: $background-body;
   color: $text-color-primary;
   display: flex;
   flex-direction: column;
@@ -60,10 +61,14 @@ body {
 
   > footer,
   > header {
+    padding: .4rem 0;
+
     > div {
+      display: flex;
+      flex-wrap: wrap;
       margin: 0 auto;
-      padding: .4rem;
       max-width: $content-width;
+      padding: .4rem;
 
       .authentication {
         > div {
@@ -95,8 +100,6 @@ body {
 
     > div {
       align-items: center;
-      display: flex;
-      flex-wrap: wrap;
 
       .logo {
         margin-right: auto;
@@ -110,18 +113,22 @@ body {
     margin: auto 0 0 0;
 
     > div {
-      align-items: center;
       color: $text-color-secondary;
-      display: flex;
-      flex-wrap: wrap;
       font-size: $font-size-decreased;
 
-      .copyright {
-        margin-right: auto;
-      }
-
       nav {
         margin: 0 auto;
+
+        ul {
+          margin: 0;
+          padding: 0;
+
+          li {
+            list-style: none;
+            margin: 0;
+            padding: 0;
+          }
+        }
       }
     }
   }
@@ -133,6 +140,7 @@ body {
   margin: 0 auto;
   max-width: $content-width;
   padding: .8rem;
+  width: 100%;
 }
 
 form {

data/app/assets/stylesheets/biovision/base/message-box.scss

@@ -32,7 +32,6 @@ section.errors {
   padding: 1.6rem;
 
   > h2 {
-    background: #fee image_url('biovision/base/icons/alert.svg') no-repeat center left 1.6rem / 1.6rem 1.6rem;
     color: #400;
     font-size: $font-size-large;
     padding: 1.6rem 1.6rem 1.6rem 4.8rem;
@@ -43,6 +42,14 @@ section.errors {
   }
 }
 
+ol.errors {
+  background: #fee image_url('biovision/base/icons/alert.svg') no-repeat top 1rem left 1rem / 1.6rem 1.6rem;
+  box-shadow: .2rem .2rem .2rem 0 hsla(0, 75%, 50%, .5);
+  color: hsl(0, 75%, 50%);
+  margin: 1rem 1.6rem;
+  padding: 1rem 1rem 1rem 5.4rem;
+}
+
 .field_with_errors {
   background: #fee;
   display: inline-block;

data/app/controllers/admin/regions_controller.rb

@@ -3,7 +3,6 @@ class Admin::RegionsController < AdminController
   include LockableEntity
 
   before_action :set_entity, except: [:index]
-  before_action :check_entity_lock, only: [:toggle]
 
   # get /admin/regions
   def index
@@ -20,18 +19,10 @@ class Admin::RegionsController < AdminController
     require_privilege_group :region_managers
   end
 
-  def restrict_editing
-    unless @entity.editable_by?(current_user)
-      handle_http_401('Current user cannot edit region')
-    end
-  end
-
   def set_entity
     @entity = Region.find_by(id: params[:id])
     if @entity.nil?
       handle_http_404("Cannot find region #{params[:id]}")
-    else
-      restrict_editing
     end
   end
 end

data/app/controllers/admin/users_controller.rb

@@ -7,8 +7,8 @@ class Admin::UsersController < AdminController
 
   # get /admin/users
   def index
-    @filter     = params[:filter] || Hash.new
-    @collection = User.page_for_administration current_page, @filter
+    @search     = param_from_request(:q)
+    @collection = User.page_for_administration current_page, @search
   end
 
   # get /admin/users/:id

data/app/controllers/authentication_controller.rb

@@ -66,6 +66,9 @@ class AuthenticationController < ApplicationController
     return_path = my_path unless return_path[0] == '/'
     cookies.delete 'return_path', domain: :all
 
-    redirect_to return_path
+    respond_to do |format|
+      format.json { render(json: { data: { url: return_path } }) }
+      format.html { redirect_to(return_path) }
+    end
   end
 end

data/app/controllers/concerns/toggleable_entity.rb

@@ -3,7 +3,9 @@ module ToggleableEntity
 
   # Toggle entity flag when allowed
   def toggle
-    if allow_toggle?
+    if entity_is_locked?
+      render json: { errors: { locked: true } }, status: :forbidden
+    elsif entity_is_editable?
       render json: { data: @entity.toggle_parameter(params[:parameter].to_s) }
     else
       head :unauthorized
@@ -12,12 +14,19 @@ module ToggleableEntity
 
   private
 
-  # If entity responds to #editable_by?, it should be editable to be toggled
-  def allow_toggle?
+  def entity_is_editable?
     if @entity.respond_to?(:editable_by?)
       @entity.editable_by?(current_user)
     else
       true
     end
   end
+
+  def entity_is_locked?
+    if @entity.respond_to?(:locked?)
+      @entity.locked?
+    else
+      false
+    end
+  end
 end

data/app/controllers/regions_controller.rb

@@ -49,7 +49,7 @@ class RegionsController < AdminController
   end
 
   def restrict_editing
-    unless @entity.editable_by?(current_user)
+    if @entity.locked? || !@entity.editable_by?(current_user)
       redirect_to admin_region_path(@entity.id), alert: t('regions.edit.forbidden')
     end
   end

data/app/helpers/biovision_users_helper.rb

@@ -2,7 +2,7 @@ module BiovisionUsersHelper
   def genders_for_select
     genders = [[t(:not_selected), '']]
     prefix  = 'activerecord.attributes.user_profile.genders.'
-    genders + UserProfile.genders.keys.to_a.map { |o| [I18n.t("#{prefix}#{o}"), o] }
+    genders + UserProfile.genders.keys.to_a.map { |o| [t("#{prefix}#{o}"), o] }
   end
 
   # @param [User] entity
@@ -26,23 +26,33 @@ module BiovisionUsersHelper
     link_to entity.name, admin_token_path(entity.id)
   end
 
-  # @param [User] user
-  def profile_avatar(user)
-    if user.is_a?(User) && !user.image.blank? && !user.deleted?
-      image_tag user.image.profile.url
+  # @param [User] entity
+  def profile_avatar(entity)
+    if entity.is_a?(User) && !entity.image.blank? && !entity.deleted?
+      user_image_profile(entity)
     else
-      image_tag 'biovision/base/placeholders/user.svg'
+      image_tag('biovision/base/placeholders/user.svg')
     end
   end
 
   # @param [User] entity
   def user_image_preview(entity)
-    return image_tag('biovision/base/placeholders/user.svg') if entity.image.blank?
-
     versions = "#{entity.image.preview_2x.url} 2x"
     image_tag(entity.image.preview.url, alt: entity.profile_name, srcset: versions)
   end
 
+  # @param [User] entity
+  def user_image_profile(entity)
+    versions = "#{entity.image.profile_2x.url} 2x"
+    image_tag(entity.image.profile.url, alt: entity.profile_name, srcset: versions)
+  end
+
+  # @param [User] entity
+  def user_image_big(entity)
+    versions = "#{entity.image.big_2x.url} 2x"
+    image_tag(entity.image.big.url, alt: entity.profile_name, srcset: versions)
+  end
+
   # @param [ForeignSite] foreign_site
   def foreign_login_link(foreign_site)
     image = "biovision/base/icons/foreign/#{foreign_site.slug}.svg"

data/app/models/region.rb

@@ -47,7 +47,7 @@ class Region < ApplicationRecord
   def editable_by?(user)
     administrator = UserPrivilege.user_has_privilege?(user, :administrator)
     manager       = UserPrivilege.user_has_privilege?(user, :region_manager, self)
-    (administrator || manager) && !locked?
+    administrator || manager
   end
 
   def parents
@@ -78,6 +78,11 @@ class Region < ApplicationRecord
     "#{parents.map(&:name).join('/')}/#{name}"
   end
 
+  def branch_name
+    return short_name if parents.blank?
+    "#{parents.map(&:short_name).join('/')}/#{short_name}"
+  end
+
   def cache_parents!
     return if parent.nil?
     self.parents_cache = "#{parent.parents_cache},#{parent_id}".gsub(/\A,/, '')

data/app/models/user.rb

@@ -55,9 +55,9 @@ class User < ApplicationRecord
   scope :filtered, ->(f) { email_like(f[:email]).screen_name_like(f[:screen_name]) }
 
   # @param [Integer] page
-  # @param [Hash] filter
-  def self.page_for_administration(page, filter = {})
-    bots(filter[:bots]).filtered(filter).order('id desc').page(page).per(PER_PAGE)
+  # @param [String] search_query
+  def self.page_for_administration(page, search_query)
+    search(search_query).order('id desc').page(page).per(PER_PAGE)
   end
 
   def self.profile_parameters

data/app/models/user_profile.rb

@@ -18,4 +18,12 @@ class UserProfile < ApplicationRecord
   def search_string
     "#{name} #{surname}"
   end
+
+  def age
+    now    = Time.now
+    bd     = birthday || now
+    result = now.year - bd.year
+    result = result - 1 if (bd.month > now.month || (bd.month >= now.month && bd.day > now.day))
+    result
+  end
 end

data/app/services/canonizer.rb

@@ -1,29 +1,30 @@
 class Canonizer
   TRANSLITERATION_MAP = {
-      'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e', 'ё' => 'yo',
-      'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l', 'м' => 'm',
-      'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u',
-      'ф' => 'f', 'х' => 'kh', 'ц' => 'c', 'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shh', 'ъ' => '',
-      'ы' => 'y', 'ь' => '', 'э' => 'e', 'ю' => 'yu', 'я' => 'ya',
+      'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e',
+      'ё' => 'yo', 'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k',
+      'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r',
+      'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'kh', 'ц' => 'c',
+      'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shh', 'ъ' => '', 'ы' => 'y', 'ь' => '',
+      'э' => 'e', 'ю' => 'yu', 'я' => 'ya',
   }
 
   # @param [String] text
   def self.transliterate(text)
-    result = text.mb_chars.downcase.to_s
+    result = text.downcase
     TRANSLITERATION_MAP.each { |r, e| result.gsub!(r, e) }
     result.downcase.gsub(/[^-a-z0-9_]/, '-').gsub(/^[-_]*([-a-z0-9_]*[a-z0-9]+)[-_]*$/, '\1').gsub(/--+/, '-')
   end
 
   # @param [String] input
   def self.canonize(input)
-    lowered   = input.mb_chars.downcase.to_s.strip
+    lowered   = input.downcase.strip
     canonized = lowered.gsub(/[^a-zа-я0-9ё]/, '')
     canonized.empty? ? lowered : canonized
   end
 
   # @param [String] input
   def self.urlize(input)
-    lowered = input.mb_chars.downcase.to_s.squish
+    lowered = input.downcase.squish
     lowered.gsub(/[^a-zа-я0-9ё]/, '-').gsub(/-\z/, '')
   end
 end