biovision-base 0.9.171227 → 0.11.180127

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

@@ -3,7 +3,7 @@
     <span><%= t('admin.tokens.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/tokens/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.token %></h1>
 
   <ul class="actions">
@@ -39,5 +39,5 @@
     <% end %>
   </dl>
 
-  <%= render partial: 'admin/tokens/toggleable', locals: { entity: @entity } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_token_path(@entity.id) } %>
 </article>

data/app/views/admin/users/codes.html.erb

@@ -5,7 +5,7 @@
     <span><%= t('.heading') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('admin.codes.index.heading') %></h1>
 
   <ul class="actions">

data/app/views/admin/users/entity/_in_list.html.erb

@@ -17,7 +17,8 @@
         <div><%= t('activerecord.attributes.user.last_seen') %>: <%= time_tag entity.last_seen %></div>
     <% end %>
   </div>
-  <%= render partial: 'admin/users/toggleable', locals: { entity: entity } %>
+
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_user_path(entity.id) } %>
   <ul class="actions">
     <li><%= edit_icon(edit_user_path(entity.id)) %></li>
   </ul>

data/app/views/admin/users/entity/_privilege.html.erb

@@ -1,6 +1,6 @@
 <div class="data">
   <div data-url="<%= privilege_admin_user_path(id: user.id, privilege_id: privilege.id) %>" class="entity">
-    <% if privilege.regional? %>
+    <% if privilege.regional? && Gem.loaded_specs.key?('biovision-regions') %>
         <span><%= privilege.name %></span>
         <ul data-url="<%= regions_admin_privilege_path(privilege.id, user_id: user.id) %>" class="regions">
           <% user.user_privileges.where(privilege: privilege).order('region_id asc').each do |link| %>

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

@@ -3,7 +3,7 @@
     <span><%= t('admin.users.nav_item.text') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   
   <ul class="actions">

data/app/views/admin/users/show.html.erb

@@ -4,7 +4,7 @@
     <span><%= @entity.profile_name %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= @entity.screen_name %></h1>
   <% if @entity.deleted? %>
       <div class="message-box-alert"><%= t(:deleted_entity) %></div>
@@ -94,8 +94,8 @@
             <% @entity.user_privileges.order('privilege_id, region_id asc nulls first').each do |link| %>
                 <li>
                   <%= link.privilege.name %>
-                  <% unless link.region.nil? %>
-                      (<%= link.region.long_name %>)
+                  <% unless link.region_id.nil? %>
+                      (<%= link.region_id %><%# link.region.long_name %>)
                   <% end %>
                 </li>
             <% end %>
@@ -105,6 +105,6 @@
   </dl>
 
   <% unless @entity.deleted? %>
-      <%= render partial: 'admin/users/toggleable', locals: { entity: @entity } %>
+    <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_user_path(@entity.id) } %>
   <% end %>
 </article>

data/app/views/admin/users/tokens.html.erb

@@ -5,7 +5,7 @@
     <span><%= t('.heading') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('admin.tokens.index.heading') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

data/app/views/application/error.html.erb

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t('.title') %>
 
-<article>
+<article class="error-page">
   <h1><%= t('.heading') %></h1>
 
   <div class="message-box-alert">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

data/app/views/errors/error.html.erb

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t(".#{action_name}.title") %>
 
-<article>
+<article class="error-page">
   <h1><%= t(".#{action_name}.heading") %></h1>
 
   <div class="message-box-alert"><%= t(".#{action_name}.message") %></div>

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

@@ -50,11 +50,9 @@
     <% end %>
     <%= hidden_field_tag 'form_id', form_id %>
   </div>
-  <div class="button">
+  <div class="buttons">
     <%= button_tag(t(:submit), type: :submit) %>
   </div>
 
   <div class="result hidden"><%= t('.result') %></div>
 <% end %>
-
-<%= render partial: 'shared/forms/default_ajax_handler', locals: { form_id: form_id } %>

data/app/views/feedback_requests/create.js.erb

@@ -1,10 +1,10 @@
 {
     const form = document.getElementById('<%= j(param_from_request(:form_id)) %>');
     const fields = form.querySelector('.fields');
-    const button = form.querySelector('.button');
+    const buttons = form.querySelector('.buttons');
     const result = form.querySelector('.result');
 
     fields.classList.add('hidden');
-    button.classList.add('hidden')
+    buttons.classList.add('hidden')
     result.classList.remove('hidden');
 }

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

@@ -1,6 +1,6 @@
 <footer>
   <div>
-    &copy; 2012–2017 Biovision
+    &copy; 2012–2018 Biovision
   </div>
   <div class="support">
     <%= link_to(t('.support'), 'mailto:support@biovision.ru') %>

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

@@ -2,10 +2,10 @@
   <%= render 'layouts/admin/header/logo' %>
   <nav>
     <ul>
-      <li><%= link_to(t('admin.index.index.heading'), admin_path) %></li>
       <% unless current_user.nil? %>
-          <li><%= link_to(t(:logout), logout_path, method: :delete) %></li>
+        <li><%= current_user.screen_name %></li>
+        <li><%= link_to(t(:logout), logout_path, method: :delete) %></li>
       <% end %>
     </ul>
   </nav>
-</header>
+</header>

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

@@ -6,7 +6,7 @@
 <% end %>
 
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t('.heading') %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

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

@@ -8,7 +8,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_privilege_path(@entity.id)) %></li>

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_privileges_path) %></li>

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

@@ -1,3 +1,4 @@
+<!--
 <script>
     'use strict';
     document.addEventListener('DOMContentLoaded', function () {
@@ -11,3 +12,4 @@
         });
     });
 </script>
+-->

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -4,7 +4,7 @@
     <span><%= t(:create) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.title') %></h1>
 
   <ul class="actions">

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

@@ -5,7 +5,7 @@
     <span><%= t(:edit) %></span>
 <% end %>
 
-<article class="entity-page">
+<article>
   <h1><%= t('.heading') %></h1>
   <ul class="actions">
     <li><%= back_icon(admin_user_path(@entity.id)) %></li>

data/config/locales/common-en.yml

@@ -1,4 +1,11 @@
 en:
+  activerecord:
+    models:
+      language: "Language"
+    attributes:
+      language:
+        slug: "Slug"
+        code: "Code"
   error_count:
     zero: "no errors"
     one: "%{count} error"
@@ -64,6 +71,9 @@ en:
   flags: "Flags"
   hide: "Hide"
   home: "Home"
+  languages:
+    english: "English"
+    russian: "Russian"
   list: "List"
   locked: "Editing is forbidden"
   "no": "No"
@@ -103,8 +113,6 @@ en:
         title: "Administration"
         heading: "Administration"
       dashboard:
-        biovision_region:
-          heading: "Regions"
         biovision_user:
           heading: "Users module"
         biovision_track:

data/config/locales/common-ru.yml

@@ -1,4 +1,11 @@
 ru:
+  activerecord:
+    models:
+      language: "Язык"
+    attributes:
+      language:
+        slug: "Идентификатор"
+        code: "Код"
   error_count:
     zero: "ошибок нет"
     one: "%{count} ошибка"
@@ -64,6 +71,9 @@ ru:
   flags: "Флаги"
   hide: "Скрыть"
   home: "Главная"
+  languages:
+    english: "Английский"
+    russian: "Русский"
   list: "К списку"
   locked: "Редактирование зарещено"
   "no": "Нет"
@@ -103,8 +113,6 @@ ru:
         title: "Администрирование"
         heading: "Администрирование"
       dashboard:
-        biovision_region:
-          heading: "Региональность"
         biovision_user:
           heading: "Модуль пользователей"
         biovision_track:

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

@@ -0,0 +1,76 @@
+en:
+  activerecord:
+    models:
+      editable_page: "Editable page"
+      stored_value: "Stored value"
+    attributes:
+      editable_page:
+        language: "Language"
+        name: "Name"
+        slug: "Slug"
+        image: "Image"
+        title: "Title"
+        keywords: "Keywords"
+        description: "Description"
+        body: "Body"
+      stored_value:
+        description: "Description"
+        name: "Name"
+        slug: "Slug"
+        value: "Value"
+  admin:
+    editable_pages:
+      nav_item:
+        description: "Managing editable pages"
+        text: "Editable pages"
+      index:
+        heading: "Editable pages"
+        title: "Editable pages"
+      show:
+        title: "Editable page \"%{name}\""
+    stored_values:
+      nav_item:
+        description: "Managing stored values"
+        text: "Stored values (Registry)"
+      index:
+        heading: "Stored values"
+        title: "Stored values"
+      show:
+        title: "Stored value \"%{slug}\""
+  editable_pages:
+    new:
+      title: "New editable page"
+      heading: "New editable page"
+    edit:
+      title: "Editing editable page"
+      heading: "Editing editable page"
+    update:
+      success: "Editable page has been updated"
+    destroy:
+      success: "Editable page has been deleted"
+    form:
+      guidelines:
+        image: "Image in JPG or PNG format of size about 640×640 for sharing preview."
+        slug: "Used for insertion inside site. Maximum 100 characters."
+        name: "Internal name for convenience. Maximum 100 characters."
+        title: "Shown as window header. Maximum 250 characters."
+        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."
+  stored_values:
+    new:
+      heading: "New stored value"
+      title: "New stored value"
+    edit:
+      title: "Editing stored value"
+      heading: "Editing stored value"
+    update:
+      success: "Stored value has been updated"
+    destroy:
+      success: "Stored value has been deleted"
+    form:
+      guidelines:
+        slug: "Used as identifier in code. Maximum 50 characters."
+        value: "Shown when needed. Maximum 255 characters."
+        name: "Internal name for convenience. Maximum 100 characters."
+        description: "Description for convenience. Maximum 250 characters."