biovision-base 0.21.180812.0 → 0.22.180920.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe07ebb0c3da033a5ad0e0b65729448ad05c47511deb17da001ef960a5e95cc1
-  data.tar.gz: d0b3269f72e6a6f64dc1f1f5e4aeebac1f26bc040b58754af01c5a5898448434
+  metadata.gz: e26d43272af3cd8b34dd325f8dec9a0728d5eeecd8b5108493c10c4260f97916
+  data.tar.gz: 694106f3d60380e268c2a93f57439bfcee085ed4e11022acf4001cde0b02f159
 SHA512:
-  metadata.gz: 1f3b099642e625e586cb11741a35d9eec303aa655e71713a46efc9c0e8b354fd03f9a1ebdfa93819fa5c14512386930de33f0f680a0269da6804c7eb021ee28d
-  data.tar.gz: 58ee25c71e41d9ea86fe6a899cbb6b4bdc212f44e6ce217288ed87b8aff3d07b414a86474c1dfca6fdc49c35a775de53c1de1c95926de326f3c3283184e50414
+  metadata.gz: 067ee5df601cebc75b36340c507f30ee0f6e89a149e1ccc5deb67e716d1d3a8b58ef7ce132a1b6b254005ec118146a45c19b76343a98912de6ee66a0cb7838de
+  data.tar.gz: 3d0a6eb7e677b759495c67a289d3e46d97807632ecb557fba1f9d548373c6c055b1533f50906f2ba57d96fc7bea8a6f86280e83e413cdb013a569cd2b25daeef

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

@@ -42,25 +42,22 @@ h6 {
   margin: 0;
 }
 
-h1 {
-  font-size: var(--font-size-xl);
-  line-height: 1.25;
-}
-
-a:link {
-  color: $link-color;
-  text-decoration: none;
-  transition: color .125s;
-}
+a {
+  &:link {
+    color: $link-color;
+    text-decoration: none;
+    transition: color .125s;
+  }
 
-a:visited {
-  color: $link-color-visited;
-}
+  &:visited {
+    color: $link-color-visited;
+  }
 
-a:active,
-a:hover {
-  color: $link-color-hover;
-  text-decoration: underline;
+  &:active,
+  &:hover {
+    color: $link-color-hover;
+    text-decoration: underline;
+  }
 }
 
 figure {

data/app/assets/stylesheets/biovision/base/buttons/buttons-common.scss

@@ -1,4 +1,4 @@
-$font-size-normal: 1.4rem !default;
+$font-size-normal: 1.6rem !default;
 $font-family-main: "Roboto", sans-serif !default;
 
 $button-action-bg-a: #2e3c8e !default;
@@ -37,6 +37,7 @@ $button-destroy-text-b: $button-destroy-text-a !default;
   cursor: pointer;
   display: inline-block;
   font: #{$font-size-normal}/1.5 $font-family-main;
+  font-size: var(--font-size-normal, #{$font-size-normal});
   padding: 0 1.2rem;
   text-decoration: none;
   transition: .125s;

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

@@ -11,6 +11,14 @@ $font-size-decreased: 1.3rem !default;
 $font-size-small: 1.1rem !default;
 $font-size-xs: 1rem !default;
 
+$spacer-xxs: .4rem !default;
+$spacer-xs: .8rem !default;
+$spacer-s: 1.6rem !default;
+$spacer-m: 3.2rem !default;
+$spacer-l: 4.8rem !default;
+$spacer-xl: 6.4rem !default;
+$spacer-xxl: 9.6rem !default;
+
 $content-width: 100rem !default;
 $content-width-min: 32rem !default;
 
@@ -36,11 +44,3 @@ $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;
-
-$spacer-xxs: .4rem;
-$spacer-xs: .8rem;
-$spacer-s: 1.6rem;
-$spacer-m: 3.2rem;
-$spacer-l: 4.8rem;
-$spacer-xl: 6.4rem;
-$spacer-xxl: 9.6rem;

data/app/controllers/media_files_controller.rb

@@ -1,6 +1,7 @@
 class MediaFilesController < ApplicationController
   skip_before_action :verify_authenticity_token, only: :ckeditor
 
+  before_action :restrict_anonymous_access
   before_action :set_entity, only: [:edit, :update, :destroy]
   before_action :restrict_editing, only: [:edit, :update, :destroy]
 

data/app/helpers/biovision_users_helper.rb

@@ -15,28 +15,29 @@ module BiovisionUsersHelper
   end
 
   # @param [User] entity
-  def user_link(entity)
+  # @param [String] text
+  def user_link(entity, text = entity&.profile_name)
     return I18n.t(:anonymous) if entity.nil? || entity.deleted?
 
-    text = entity.profile_name
     link_to(text, user_profile_path(slug: entity.screen_name), class: 'profile')
   end
 
   # @param [User] entity
-  def admin_user_link(entity)
+  # @param [String] text
+  def admin_user_link(entity, text = entity&.profile_name)
     return I18n.t(:anonymous) if entity.nil?
 
-    text = entity.profile_name
     link_to(text, admin_user_path(id: entity.id), class: 'profile')
   end
 
   # @param [ForeignUser] entity
-  # @param [String] long_slug
+  # @param [String] text
   def admin_foreign_user_link(entity, text = entity.long_slug)
     link_to(text, admin_foreign_user_path(id: entity.id))
   end
 
   # @param [User] entity
+  # @deprecated use #admin_user_link
   def editor_user_link(entity)
     return t(:anonymous) if entity.nil?
 

data/app/models/concerns/meta_texts.rb

@@ -0,0 +1,15 @@
+module MetaTexts
+  extend ActiveSupport::Concern
+
+  included do
+    validates_length_of :meta_description, maximum: 500
+    validates_length_of :meta_keywords, maximum: 250
+    validates_length_of :meta_title, maximum: 250
+
+    protected
+
+    def self.meta_text_fields
+      %i[meta_description meta_keywords meta_title]
+    end
+  end
+end

data/app/views/about/editable.html.erb

@@ -1,11 +1,15 @@
 <% if @editable_page.nil? %>
-    <% content_for :meta_title, t('.title') %>
+  <% content_for :meta_title, t('.title') %>
 
-    <article>
-      <h1><%= t('.heading') %></h1>
+  <article>
+    <h1><%= t('.heading') %></h1>
 
-      <div class="message-box-warning"><%= t('.message') %></div>
-    </article>
+    <div class="message-box-warning"><%= t('.message') %></div>
+  </article>
 <% else %>
-    <%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>
+  <% content_for :breadcrumbs do %>
+    <span><%= @editable_page.title %></span>
+  <% end %>
+
+  <%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>
 <% end %>

data/app/views/agents/_form.html.erb

@@ -27,6 +27,9 @@
         <%= f.label :bot %>
       </li>
     </ul>
+
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/browsers/_form.html.erb

@@ -22,6 +22,9 @@
         <%= f.label :bot %>
       </li>
     </ul>
+
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/codes/_form.html.erb

@@ -76,6 +76,8 @@
       </dd>
     </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/editable_blocks/_form.html.erb

@@ -168,6 +168,8 @@
     <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= hidden_field_tag :entity_id, entity.id %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>

data/app/views/editable_pages/_form.html.erb

@@ -150,6 +150,8 @@
     </dd>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>

data/app/views/index/index.html.erb

@@ -1,6 +1,6 @@
 <% if @editable_page.nil? %>
   <% content_for :meta_title, t('.title') %>
-  <% content_for :meta_title, t('.description') %>
+  <% content_for :meta_description, t('.description') %>
 <% else %>
   <%= render partial: 'editable_pages/entity/metadata', locals: { entity: @editable_page } %>
 <% end %>

data/app/views/layouts/application/_footer.html.erb

@@ -1,4 +1,4 @@
-<footer>
+<footer id="main-footer">
   <div>
     <div class="copyright">&copy; <%= t(:copyright) %></div>
     <nav>

data/app/views/layouts/application/_header.html.erb

@@ -1,4 +1,4 @@
-<header id="site-header">
+<header id="main-header">
   <div>
     <%= render 'layouts/application/header/logo' %>
     <nav>

data/app/views/link_block_items/_form.html.erb

@@ -151,6 +151,8 @@
     <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= f.hidden_field :link_block_id if entity.id.nil? %>
     <%= hidden_field_tag :entity_id, entity.id %>

data/app/views/link_blocks/_form.html.erb

@@ -92,6 +92,8 @@
     <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= hidden_field_tag :entity_id, entity.id %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>

data/app/views/media_files/_form.html.erb

@@ -66,6 +66,8 @@
     </dd>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= f.hidden_field(:media_folder_id) if entity.id.nil? %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>

data/app/views/media_folders/_form.html.erb

@@ -45,6 +45,8 @@
     </dd>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= f.hidden_field(:parent_id) if entity.id.nil? %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>

data/app/views/metrics/_form.html.erb

@@ -35,6 +35,8 @@
       </li>
     </ul>
 
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/privilege_groups/_form.html.erb

@@ -19,6 +19,9 @@
         <div class="guideline"><%= t('.guidelines.description') %></div>
       </dd>
     </dl>
+
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/privileges/_form.html.erb

@@ -37,6 +37,8 @@
       <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
     </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.hidden_field :parent_id if entity.id.nil? %>
       <%= f.button t(:save), type: :submit %>

data/app/views/shared/entity/_meta_texts.html.erb

@@ -0,0 +1,14 @@
+<% unless entity.meta_title.blank? %>
+  <dt><%= t('.meta_title') %></dt>
+  <dd><%= entity.meta_title %></dd>
+<% end %>
+
+<% unless entity.meta_description.blank? %>
+  <dt><%= t('.meta_description') %></dt>
+  <dd><%= entity.meta_description %></dd>
+<% end %>
+
+<% unless entity.meta_keywords.blank? %>
+  <dt><%= t('.meta_keywords') %></dt>
+  <dd><%= entity.meta_keywords %></dd>
+<% end %>

data/app/views/shared/entity/_timestamps.html.erb

@@ -0,0 +1,9 @@
+<% unless entity.created_at.nil? %>
+  <dt><%= t(:created_at) %></dt>
+  <dd><%= time_tag(entity.created_at) %></dd>
+<% end %>
+
+<% unless entity.updated_at.nil? %>
+  <dt><%= t(:updated_at) %></dt>
+  <dd><%= time_tag(entity.updated_at) %></dd>
+<% end %>

data/app/views/shared/forms/_meta_texts.html.erb

@@ -0,0 +1,51 @@
+<% model_name = f.object.class.to_s.underscore %>
+<dt><%= f.label :meta_title %></dt>
+<dd>
+  <%=
+    f.text_field(
+        :meta_title,
+        id:        "#{model_name}_meta_title",
+        size:      nil,
+        maxlength: 250,
+        data:      {
+            check: :meta_title
+        }
+    )
+  %>
+  <div class="check-result-error hidden" data-field="meta_title"></div>
+  <div class="guideline"><%= t('.guidelines.meta_title') %></div>
+</dd>
+
+<dt><%= f.label :meta_description %></dt>
+<dd>
+  <%=
+    f.text_field(
+        :meta_description,
+        id:        "#{model_name}_meta_description",
+        size:      nil,
+        maxlength: 500,
+        data:      {
+            check: :meta_description
+        }
+    )
+  %>
+  <div class="check-result-error hidden" data-field="meta_description"></div>
+  <div class="guideline"><%= t('.guidelines.meta_description') %></div>
+</dd>
+
+<dt><%= f.label :meta_keywords %></dt>
+<dd>
+  <%=
+    f.text_field(
+        :meta_keywords,
+        id:        "#{model_name}_meta_keywords",
+        size:      nil,
+        maxlength: 250,
+        data:      {
+            check: :meta_keywords
+        }
+    )
+  %>
+  <div class="check-result-error hidden" data-field="meta_keywords"></div>
+  <div class="guideline"><%= t('.guidelines.meta_keywords') %></div>
+</dd>

data/app/views/shared/forms/_wysiwyg.html.erb

@@ -1,11 +1,19 @@
-<script src="//cdn.ckeditor.com/4.9.2/standard/ckeditor.js"></script>
+<script src="https://cdn.ckeditor.com/ckeditor5/11.0.1/classic/ckeditor.js"></script>
 <script>
+    'use strict';
     document.addEventListener('DOMContentLoaded', function () {
-        document.querySelectorAll('form [data-wysiwyg]').forEach(function(editor) {
-            CKEDITOR.replace(editor, {
-                filebrowserUploadUrl: '/media_files/ckeditor',
-                removePlugins: 'forms,save,preview,flash,bidi,language,print,templates,newpage,iframe,about,scayt,wsc',
-            });
+        document.querySelectorAll('form [data-wysiwyg]').forEach(function (editor) {
+            editor.required = false;
+            ClassicEditor
+                .create(editor, {
+                    image: {
+                        toolbar: ['imageTextAlternative']
+                    },
+                    ckfinder: {
+                        uploadUrl: '/media_files/ckeditor'
+                    }
+                })
+                .catch(error => console.error(error));
         });
     });
 </script>

data/app/views/stored_values/_form.html.erb

@@ -27,6 +27,8 @@
       </dd>
     </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/tokens/_form.html.erb

@@ -24,6 +24,8 @@
       <li><%= f.check_box :active %><%= f.label :active %></li>
     </ul>
 
+  <%= render 'shared/forms/state_container' %>
+
     <div class="buttons">
       <%= f.button t(:save), type: :submit %>
     </div>

data/app/views/users/_form.html.erb

@@ -126,14 +126,11 @@
       <div class="guideline"><%= t('.guidelines.notice') %></div>
     </dd>
 
-    <%=
-      render(
-          partial: 'shared/forms/entity_flags',
-          locals: { f: f, entity: entity, model_name: model_name }
-      )
-    %>
+    <%= render(partial: 'shared/forms/entity_flags', locals: { f: f }) %>
   </dl>
 
+  <%= render 'shared/forms/state_container' %>
+
   <div class="buttons">
     <%= f.hidden_field :consent if entity.id.nil? %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>

data/config/locales/common-en.yml

@@ -101,6 +101,11 @@ en:
       next: "→"
       truncate: "…"
   shared:
+    entity:
+      meta_texts:
+        meta_title: "meta: title"
+        meta_description: "meta: description"
+        meta_keywords: "meta: keywords"
     flash_messages:
       notice: "Notice"
       warning: "Warning"
@@ -112,6 +117,11 @@ en:
     forms:
       state_container:
         saving: "Saving..."
+      meta_texts:
+        guidelines:
+          meta_title: "Maximum 250 characters"
+          meta_description: "30 to 50 words, maximum 500 characters."
+          meta_keywords: "Maximum 250 characters."
   admin:
     index:
       index:

data/config/locales/common-ru.yml

@@ -102,6 +102,11 @@ ru:
       next: "→"
       truncate: "…"
   shared:
+    entity:
+      meta_texts:
+        meta_title: "Текст для заголовка окна"
+        meta_description: "Описание для метатэга"
+        meta_keywords: "Ключевые слова для метатэга"
     flash_messages:
       notice: "Замечание"
       warning: "Предупреждение"
@@ -113,6 +118,11 @@ ru:
     forms:
       state_container:
         saving: "Сохранение…"
+      meta_texts:
+        guidelines:
+          meta_title: "Максимум 250 символов"
+          meta_description: "30–50 слов, максимум 500 символов."
+          meta_keywords: "Максимум 250 символов."
   admin:
     index:
       index:

data/config/locales/common-sv.yml

@@ -101,6 +101,11 @@ sv:
       next: "→"
       truncate: "…"
   shared:
+    entity:
+      meta_texts:
+        meta_title: "meta: title"
+        meta_description: "meta: description"
+        meta_keywords: "meta: keywords"
     flash_messages:
       notice: "Meddelande"
       warning: "Förmaning"
@@ -112,6 +117,11 @@ sv:
     forms:
       state_container:
         saving: "Sparar..."
+      meta_texts:
+        guidelines:
+          meta_title: "Up till 250 tecken"
+          meta_description: "30 till 50 ord, up till 500 tecken."
+          meta_keywords: "Up till 250 tecken."
   admin:
     index:
       index:

data/config/locales/editable-pages-en.yml

@@ -104,6 +104,9 @@ en:
         keywords: "Value for meta keywords (for search robots). Maximum 250 characters."
         description: "Meta description for search robots, search results and sharing. Maximum 250 characters."
         body: "HTML for insertion inside the site. Maximum 64kiB of text."
+        url: "Absolute URL"
+      placeholders:
+        url: "/about/editable-pages"
   stored_values:
     new:
       heading: "New stored value"

data/config/locales/editable-pages-sv.yml

@@ -82,6 +82,9 @@ sv:
         name: "Used for more convenient management. Maximum 100 characters."
         slug: "Only latin letters, numbers, dash or underscore (except start or end). 2 to 50 characters."
         title: "Maximum 100 characters."
+        url: "Absolute URL"
+      placeholders:
+        url: "/about/editable-pages"
     update:
       success: "Editable block has been updated"
   editable_pages:

data/config/routes.rb

@@ -19,11 +19,7 @@ Rails.application.routes.draw do
 
   resources :feedback_requests, only: :destroy
 
-  resources :link_blocks, :link_block_items, only: %i[update destroy] do
-    collection do
-      post 'check', defaults: { format: :json }
-    end
-  end
+  resources :link_blocks, :link_block_items, only: %i[update destroy]
 
   scope '(:locale)', constraints: { locale: /ru|en|sv/ } do
     # Handling errors
@@ -155,10 +151,6 @@ Rails.application.routes.draw do
       end
     end
 
-    # namespace :api, defaults: { format: :json } do
-    #   get 'embed' => 'embed#index'
-    # end
-
     namespace :my do
       get '/' => 'index#index'
 

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.21.180812.0'
+    VERSION = '0.22.180920.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.21.180812.0
+  version: 0.22.180920.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,7 +237,6 @@ files:
 - app/controllers/admin/users_controller.rb
 - app/controllers/admin_controller.rb
 - app/controllers/agents_controller.rb
-- app/controllers/api/embed_controller.rb
 - app/controllers/authentication_controller.rb
 - app/controllers/browsers_controller.rb
 - app/controllers/codes_controller.rb
@@ -294,6 +293,7 @@ files:
 - app/models/code_type.rb
 - app/models/concerns/checkable.rb
 - app/models/concerns/has_owner.rb
+- app/models/concerns/meta_texts.rb
 - app/models/concerns/required_unique_name.rb
 - app/models/concerns/required_unique_slug.rb
 - app/models/concerns/toggleable.rb
@@ -576,9 +576,12 @@ files:
 - app/views/shared/admin/_list_with_priority.html.erb
 - app/views/shared/admin/_toggleable.html.erb
 - app/views/shared/editable_pages/_body.html.erb
+- app/views/shared/entity/_meta_texts.html.erb
+- app/views/shared/entity/_timestamps.html.erb
 - app/views/shared/filter/_flag.html.erb
 - app/views/shared/forms/_entity_flags.html.erb
 - app/views/shared/forms/_image_remover.html.erb
+- app/views/shared/forms/_meta_texts.html.erb
 - app/views/shared/forms/_state_container.html.erb
 - app/views/shared/forms/_wysiwyg.html.erb
 - app/views/shared/forms/check.jbuilder

data/app/controllers/api/embed_controller.rb

@@ -1,6 +0,0 @@
-class Api::EmbedController < ApplicationController
-  # get /api/embed
-  def index
-    head :no_content
-  end
-end