biovision-base 0.17.180619 → 0.19.180703.1

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

@@ -1,9 +1,23 @@
 ru:
   activerecord:
     models:
+      editable_block: "Редактируемый блок"
       editable_page: "Редактируемая страница"
       stored_value: "Хранимое значение"
     attributes:
+      editable_block:
+        body: "Основной текст"
+        description: "Описание"
+        footer: "Текст под основным"
+        image: "Картинка"
+        language: "Язык"
+        language_id: "Язык"
+        lead: "Текст до основного"
+        name: "Название"
+        raw_output: "Вывод как есть"
+        slug: "Идентификатор"
+        title: "Заголовок"
+        visible: "Показывать"
       editable_page:
         body: "Содержимое"
         description: "Метаописание"
@@ -24,6 +38,19 @@ ru:
         slug: "Идентификатор"
         value: "Значение"
   admin:
+    editable_blocks:
+      show:
+        title: "Редактируемый блок «%{slug}»"
+      nav_item:
+        text: "Редактируемые блоки"
+        description: "Управление редактируемыми блоками"
+      index:
+        title: "Блоки ссылок"
+        heading: "Блоки ссылок"
+      entity:
+        items:
+          heading: "Ссылки"
+          new_item: "Добавить ссылку"
     editable_pages:
       nav_item:
         description: "Управление редактируемыми страницами"
@@ -42,6 +69,29 @@ ru:
         title: "Хранимые значения"
       show:
         title: "Хранимое значение «%{slug}»"
+  editable_blocks:
+    new:
+      heading: "Добавить редактируемый блок"
+      nav_text: "Создать"
+      title: "Добавление редактируемого блока"
+    edit:
+      heading: "Редактирование редактируемого блока"
+      nav_text: "Редактировать"
+      title: "Редактирование редактируемого блока"
+    destroy:
+      success: "Редактируемый блок удалён"
+    form:
+      guidelines:
+        body: "Максимум 5000 символов."
+        description: "Для удобства администрирования. Максимум 250 символов."
+        footer: "Максимум 5000 символов."
+        image: "Картинка в формате JPG или PNG размером в пределах 1280×640 для заднего фона."
+        lead: "Максимум 5000 символов."
+        name: "Используется в админке для удобства поиска. Максимум 100 символов."
+        slug: "Только латинские буквы, цифры, дефис или подчёркивание (кроме начала и конца). 2–50 символов."
+        title: "Максимум 100 символов."
+    update:
+      success: "Редактируемый блок успешно отредактирован"
   editable_pages:
     new:
       title: "Новая редактируемая страница"

data/config/locales/links-ru.yml

@@ -0,0 +1,95 @@
+ru:
+  activerecord:
+    models:
+      link_block: "Блок ссылок"
+      link_block_item: "Ссылка"
+    attributes:
+      link_block:
+        footer_text: "Текст после ссылок"
+        language: "Язык"
+        language_id: "Язык"
+        lead: "Текст до ссылок"
+        slug: "Идентификатор"
+        title: "Название"
+        visible: "Показывать"
+      link_block_item:
+        body: "Текст"
+        button_text: "Текст на кнопке"
+        button_url: "Ссылка на кнопке"
+        image: "Картинка"
+        image_alt_text: "Текст для атрибута alt картинки"
+        link_block: "Блок"
+        priority: "Порядок сортировки"
+        slug: "Идентификатор"
+        title: "Название"
+        visible: "Показывать"
+  admin:
+    link_block_items:
+      nav_item:
+        description: "Управление блоками ссылок"
+        text: "Блоки ссылок"
+      index:
+        heading: "Блоки ссылок"
+        title: "Блоки ссылок"
+      show:
+        title: "Блок ссылок «%{title}»"
+    link_blocks:
+      show:
+        title: "Блок ссылок «%{slug}»"
+      nav_item:
+        text: "Блоки ссылок"
+        description: "Управление блоками ссылок"
+      index:
+        title: "Блоки ссылок"
+        heading: "Блоки ссылок"
+      entity:
+        items:
+          heading: "Ссылки"
+          new_item: "Добавить ссылку"
+    index:
+      dashboard:
+        biovision_links:
+          heading: "Блоки со ссылками"
+  link_block_items:
+    new:
+      heading: "Новая ссылка"
+      nav_text: "Добавить ссылку"
+      title: "Добавление ссылки"
+    edit:
+      heading: "Редактирование ссылки"
+      nav_text: "Редактировать"
+      title: "Редактирование ссылки"
+    destroy:
+      success: "Ссылка успешно удалена"
+    update:
+      success: "Ссылка успешно отредактирована"
+    form:
+      guidelines:
+        body: "Максимум 5000 символов."
+        button_text: "Максимум 50 символов"
+        button_url: "Максимум 250 символов"
+        image: "Картинка размером в районе 320×320, формат — SVG, JPG или PNG."
+        image_alt_text: "Максимум 255 символов."
+        slug: "Только латинские буквы, цифры, дефис или подчёркивание (кроме начала и конца). 2–50 символов."
+        title: "Максимум 250 символов."
+    list:
+      more: "Подробнее"
+  link_blocks:
+    new:
+      title: "Добавление блока ссылок"
+      heading: "Добавить блок ссылок"
+      nav_text: "Создать"
+    edit:
+      heading: "Редактирование блока ссылок"
+      title: "Редактирование блока ссылок"
+      nav_text: "Редактировать"
+    destroy:
+      success: "Блок ссылок удалён"
+    form:
+      guidelines:
+        footer_text: "Максимум 5000 символов."
+        lead: "Максимум 5000 символов."
+        slug: "Только латинские буквы, цифры, дефис или подчёркивание (кроме начала и конца). 2–50 символов."
+        title: "Максимум 100 символов."
+    update:
+      success: "Блок ссылок успешно отредактирован"

data/config/locales/users-en.yml

@@ -104,6 +104,7 @@ en:
         payload: "Payload"
         quantity: "Number of activations"
       privilege:
+        administrative: "Administrative"
         parent_id: "Parent category"
         priority: "Sorting order"
         regional: "Regional"

data/config/locales/users-ru.yml

@@ -104,6 +104,7 @@ ru:
         payload: "Полезная нагрузка"
         quantity: "Количество активаций"
       privilege:
+        administrative: "Административная"
         parent_id: "Родительская категория"
         priority: "Порядок сортировки"
         regional: "Региональная"

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   resources :agents, :browsers, only: [:update, :destroy]
 
+  resources :editable_blocks, only: [:update, :destroy]
   resources :editable_pages, only: [:update, :destroy]
   resources :stored_values, only: [:update, :destroy]
 
@@ -17,6 +18,12 @@ Rails.application.routes.draw do
 
   resources :feedback_requests, only: [:destroy]
 
+  resources :link_blocks, :link_block_items, only: [:update, :destroy] do
+    collection do
+      post 'check', defaults: { format: :json }
+    end
+  end
+
   scope '(:locale)', constraints: { locale: /ru|en/ } do
     # Handling errors
     match '/400' => 'errors#bad_request', via: :all
@@ -67,6 +74,11 @@ Rails.application.routes.draw do
           post 'priority', defaults: { format: :json }
         end
       end
+      resources :editable_blocks, only: [:index, :show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+        end
+      end
       resources :stored_values, only: [:index, :show]
 
       resources :metrics, only: [:index, :show] do
@@ -126,6 +138,18 @@ Rails.application.routes.draw do
           post 'toggle', defaults: { format: :json }
         end
       end
+
+      resources :link_blocks, only: [:index, :show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+        end
+      end
+      resources :link_block_items, only: [:show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+          post 'priority', defaults: { format: :json }
+        end
+      end
     end
 
     namespace :my do
@@ -146,8 +170,19 @@ Rails.application.routes.draw do
     resources :agents, :browsers, except: [:index, :show, :update, :destroy]
 
     resources :editable_pages, except: [:index, :show, :update, :destroy]
+    resources :editable_blocks, except: [:index, :show, :update, :destroy] do
+      collection do
+        post 'check', defaults: { format: :json }
+      end
+    end
     resources :stored_values, except: [:index, :show, :update, :destroy]
 
+    resources :link_blocks, :link_block_items, except: [:index, :show, :update, :destroy] do
+      collection do
+        post 'check', defaults: { format: :json }
+      end
+    end
+
     resources :users, except: [:index, :show, :update, :destroy] do
       collection do
         post 'check', defaults: { format: :json }

data/db/migrate/20170302000101_create_privileges.rb

@@ -36,5 +36,6 @@ class CreatePrivileges < ActiveRecord::Migration[5.1]
     Privilege.create!(slug: 'metrics_manager', name: 'Аналитик метрик')
     Privilege.create!(slug: 'moderator', name: 'Модератор')
     Privilege.create!(slug: 'chief_editor', name: 'Главный редактор')
+    Privilege.create!(slug: 'content_manager', name: 'Контент-менеджер')
   end
 end

data/db/migrate/20180622140000_create_link_blocks.rb

@@ -0,0 +1,29 @@
+class CreateLinkBlocks < ActiveRecord::Migration[5.2]
+  def up
+    unless LinkBlock.table_exists?
+      create_table :link_blocks do |t|
+        t.timestamps
+        t.references :language, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.boolean :visible, default: true, null: false
+        t.string :slug, null: false
+        t.string :title
+        t.text :lead
+        t.text :footer_text
+      end
+
+      create_privilege
+    end
+  end
+
+  def down
+    if LinkBlock.table_exists?
+      drop_table :link_blocks
+    end
+  end
+
+  def create_privilege
+    unless Privilege.where(slug: 'content_manager').exists?
+      Privilege.create! slug: 'content_manager', name: 'Контент-менеджер'
+    end
+  end
+end

data/db/migrate/20180622140001_create_link_block_items.rb

@@ -0,0 +1,23 @@
+class CreateLinkBlockItems < ActiveRecord::Migration[5.2]
+  def up
+    create_table :link_block_items do |t|
+      t.timestamps
+      t.references :link_block, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.boolean :visible, default: true, null: false
+      t.integer :priority, limit: 2, default: 1, null: false
+      t.string :slug
+      t.string :image
+      t.string :image_alt_text
+      t.string :title
+      t.string :button_text
+      t.string :button_url
+      t.text :body
+    end
+  end
+
+  def down
+    if LinkBlockItem.table_exists?
+      drop_table :LinkBlockItem
+    end
+  end
+end

data/db/migrate/20180627190000_create_editable_blocks.rb

@@ -0,0 +1,39 @@
+class CreateEditableBlocks < ActiveRecord::Migration[5.2]
+  def up
+    unless EditableBlock.table_exists?
+      create_table :editable_blocks do |t|
+        t.timestamps
+        t.references :language, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.boolean :visible, default: true, null: false
+        t.boolean :raw_output, default: false, null: false
+        t.string :slug, null: false
+        t.string :name
+        t.string :description
+        t.string :image
+        t.string :title
+        t.text :lead
+        t.text :body
+        t.text :footer
+      end
+
+      add_default_blocks
+    end
+  end
+
+  def down
+    if EditableBlock.table_exists?
+      drop_table :editable_blocks
+    end
+  end
+
+  private
+
+  def add_default_blocks
+    EditableBlock.create(
+      slug: 'counters',
+      name: 'Счётчики для сайта',
+      description: 'Используется только основной текст, всегда «как есть»',
+      raw_output: true
+    )
+  end
+end

data/db/migrate/20180703111111_add_fields_to_editable_blocks.rb

@@ -0,0 +1,14 @@
+class AddFieldsToEditableBlocks < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists? :editable_blocks, :description
+      add_column :editable_blocks, :description, :string
+    end
+    unless column_exists? :editable_blocks, :raw_output
+      add_column :editable_blocks, :raw_output, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.17.180619'
+    VERSION = '0.19.180703.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.17.180619
+  version: 0.19.180703.1
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,8 @@ files:
 - app/assets/images/biovision/base/icons/return.svg
 - app/assets/images/biovision/base/icons/warning.svg
 - app/assets/images/biovision/base/icons/world.svg
+- app/assets/images/biovision/base/placeholders/16x9.svg
+- app/assets/images/biovision/base/placeholders/3x2.svg
 - app/assets/images/biovision/base/placeholders/file.svg
 - app/assets/images/biovision/base/placeholders/image.svg
 - app/assets/images/biovision/base/placeholders/photo.svg
@@ -217,9 +219,12 @@ files:
 - app/controllers/admin/agents_controller.rb
 - app/controllers/admin/browsers_controller.rb
 - app/controllers/admin/codes_controller.rb
+- app/controllers/admin/editable_blocks_controller.rb
 - app/controllers/admin/editable_pages_controller.rb
 - app/controllers/admin/feedback_requests_controller.rb
 - app/controllers/admin/index_controller.rb
+- app/controllers/admin/link_block_items_controller.rb
+- app/controllers/admin/link_blocks_controller.rb
 - app/controllers/admin/login_attempts_controller.rb
 - app/controllers/admin/media_files_controller.rb
 - app/controllers/admin/media_folders_controller.rb
@@ -237,12 +242,16 @@ files:
 - app/controllers/concerns/authentication.rb
 - app/controllers/concerns/entity_priority.rb
 - app/controllers/concerns/lockable_entity.rb
+- app/controllers/concerns/removable_image.rb
 - app/controllers/concerns/toggleable_entity.rb
+- app/controllers/editable_blocks_controller.rb
 - app/controllers/editable_pages_controller.rb
 - app/controllers/errors_controller.rb
 - app/controllers/fallback_controller.rb
 - app/controllers/feedback_requests_controller.rb
 - app/controllers/index_controller.rb
+- app/controllers/link_block_items_controller.rb
+- app/controllers/link_blocks_controller.rb
 - app/controllers/media_files_controller.rb
 - app/controllers/media_folders_controller.rb
 - app/controllers/metrics_controller.rb
@@ -264,6 +273,7 @@ files:
 - app/helpers/codes_helper.rb
 - app/helpers/editable_pages_helper.rb
 - app/helpers/languages_helper.rb
+- app/helpers/link_blocks_helper.rb
 - app/helpers/media_helper.rb
 - app/helpers/privileges_helper.rb
 - app/helpers/stored_values_helper.rb
@@ -284,11 +294,14 @@ files:
 - app/models/concerns/required_unique_name.rb
 - app/models/concerns/required_unique_slug.rb
 - app/models/concerns/toggleable.rb
+- app/models/editable_block.rb
 - app/models/editable_page.rb
 - app/models/feedback_request.rb
 - app/models/foreign_site.rb
 - app/models/foreign_user.rb
 - app/models/language.rb
+- app/models/link_block.rb
+- app/models/link_block_item.rb
 - app/models/login_attempt.rb
 - app/models/media_file.rb
 - app/models/media_folder.rb
@@ -313,6 +326,7 @@ files:
 - app/services/user_profile_handler.rb
 - app/uploaders/avatar_uploader.rb
 - app/uploaders/editable_page_image_uploader.rb
+- app/uploaders/link_block_image_uploader.rb
 - app/uploaders/media_file_uploader.rb
 - app/uploaders/media_snapshot_uploader.rb
 - app/views/about/contact.html.erb
@@ -334,6 +348,10 @@ files:
 - app/views/admin/codes/entity/_in_list.html.erb
 - app/views/admin/codes/index.html.erb
 - app/views/admin/codes/show.html.erb
+- app/views/admin/editable_blocks/_nav_item.html.erb
+- app/views/admin/editable_blocks/entity/_in_list.html.erb
+- app/views/admin/editable_blocks/index.html.erb
+- app/views/admin/editable_blocks/show.html.erb
 - app/views/admin/editable_pages/_nav_item.html.erb
 - app/views/admin/editable_pages/entity/_in_list.html.erb
 - app/views/admin/editable_pages/index.html.erb
@@ -344,11 +362,19 @@ files:
 - app/views/admin/index/_biovision_base.html.erb
 - app/views/admin/index/_custom_dashboard.html.erb
 - app/views/admin/index/dashboard/_biovision_feedback.html.erb
+- app/views/admin/index/dashboard/_biovision_links.html.erb
 - app/views/admin/index/dashboard/_biovision_track.html.erb
 - app/views/admin/index/dashboard/_biovision_user.html.erb
 - app/views/admin/index/dashboard/_editorial.html.erb
 - app/views/admin/index/dashboard/_settings.html.erb
 - app/views/admin/index/index.html.erb
+- app/views/admin/link_block_items/entity/_in_list.html.erb
+- app/views/admin/link_block_items/show.html.erb
+- app/views/admin/link_blocks/_nav_item.html.erb
+- app/views/admin/link_blocks/entity/_in_list.html.erb
+- app/views/admin/link_blocks/entity/_items.html.erb
+- app/views/admin/link_blocks/index.html.erb
+- app/views/admin/link_blocks/show.html.erb
 - app/views/admin/login_attempts/_nav_item.html.erb
 - app/views/admin/login_attempts/entity/_in_list.html.erb
 - app/views/admin/login_attempts/included/_agents.jbuilder
@@ -432,6 +458,10 @@ files:
 - app/views/codes/_form.html.erb
 - app/views/codes/edit.html.erb
 - app/views/codes/new.html.erb
+- app/views/editable_blocks/_entity.html.erb
+- app/views/editable_blocks/_form.html.erb
+- app/views/editable_blocks/edit.html.erb
+- app/views/editable_blocks/new.html.erb
 - app/views/editable_pages/_editable_page.html.erb
 - app/views/editable_pages/_form.html.erb
 - app/views/editable_pages/edit.html.erb
@@ -466,6 +496,14 @@ files:
 - app/views/layouts/profile/_header.html.erb
 - app/views/layouts/profile/_sidebar.html.erb
 - app/views/layouts/profile/header/_navigation.html.erb
+- app/views/link_block_items/_form.html.erb
+- app/views/link_block_items/_list.html.erb
+- app/views/link_block_items/edit.html.erb
+- app/views/link_block_items/new.html.erb
+- app/views/link_blocks/_entity.html.erb
+- app/views/link_blocks/_form.html.erb
+- app/views/link_blocks/edit.html.erb
+- app/views/link_blocks/new.html.erb
 - app/views/media_files/_form.html.erb
 - app/views/media_files/ckeditor.html.erb
 - app/views/media_files/edit.html.erb
@@ -533,6 +571,7 @@ files:
 - app/views/shared/filter/_flag.html.erb
 - app/views/shared/forms/_default_ajax_handler.html.erb
 - app/views/shared/forms/_entity_flags.html.erb
+- app/views/shared/forms/_image_remover.html.erb
 - app/views/shared/forms/_list_of_errors.js.erb
 - app/views/shared/forms/_wysiwyg.html.erb
 - app/views/shared/forms/check.jbuilder
@@ -557,6 +596,7 @@ files:
 - config/locales/editable-pages-ru.yml
 - config/locales/feedback-en.yml
 - config/locales/feedback-ru.yml
+- config/locales/links-ru.yml
 - config/locales/media-en.yml
 - config/locales/media-ru.yml
 - config/locales/plurals.rb
@@ -593,6 +633,10 @@ files:
 - db/migrate/20180610222222_add_consent_to_feedback_requests.rb
 - db/migrate/20180612111111_add_administrative_to_privilege.rb
 - db/migrate/20180619121212_add_image_alt_text_to_editable_page.rb
+- db/migrate/20180622140000_create_link_blocks.rb
+- db/migrate/20180622140001_create_link_block_items.rb
+- db/migrate/20180627190000_create_editable_blocks.rb
+- db/migrate/20180703111111_add_fields_to_editable_blocks.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb