biovision-base 0.15.180502 → 0.17.180619

data/app/views/editable_pages/entity/_metadata.html.erb

@@ -3,10 +3,7 @@
 <% content_for(:meta_description, entity.description) unless entity.description.blank? %>
 <% unless entity.image.blank? %>
   <% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) %>
-<% end %>
-<% content_for :meta_type_extension do %>
-  <meta property="og:article:published_time" content="<%= entity.created_at.strftime('%F') %>"/>
-  <meta property="og:article:modified_time" content="<%= entity.updated_at.strftime('%F') %>"/>
+  <% content_for :meta_image_alt, entity.image_alt_text %>
 <% end %>
 <% content_for :meta_twitter do %>
   <meta name="twitter:card" content="summary_large_image"/>

data/app/views/fallback/show.html.erb

@@ -0,0 +1 @@
+<%= render partial: 'editable_pages/editable_page', locals: { entity: @editable_page } %>

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

@@ -1,4 +1,7 @@
-<% form_id = 'feedback-request-form' unless local_assigns[:form_id] %>
+<%
+  form_id = 'feedback_request-form' unless local_assigns[:form_id]
+  entity = FeedbackRequest.new unless local_assigns[:entity]
+%>
 <%= form_with model: entity, html: { id: form_id } do |f| %>
   <div class="fields">
     <%=
@@ -11,31 +14,35 @@
           required:    true
       )
     %>
-    <%=
-      f.phone_field(
-          :phone,
-          size:        nil,
-          maxlength:   FeedbackRequest::PHONE_LIMIT,
-          placeholder: t('activerecord.attributes.feedback_request.phone'),
-          aria:        {
-              label: t('activerecord.attributes.feedback_request.phone')
-          },
-          required:    true
-      )
-    %>
-    <%=
-      f.email_field(
-          :email,
-          size:        nil,
-          maxlength:   FeedbackRequest::EMAIL_LIMIT,
-          placeholder: t('activerecord.attributes.feedback_request.email'),
-          aria:        {
-              label: t('activerecord.attributes.feedback_request.email')
-          },
-          required:    true
-      )
-    %>
-    <% if local_assigns[:accept_comment] %>
+    <% unless local_assigns[:hide_phone] %>
+      <%=
+        f.phone_field(
+            :phone,
+            size:        nil,
+            maxlength:   FeedbackRequest::PHONE_LIMIT,
+            placeholder: t('activerecord.attributes.feedback_request.phone'),
+            aria:        {
+                label: t('activerecord.attributes.feedback_request.phone')
+            },
+            required:    true
+        )
+      %>
+    <% end %>
+    <% unless local_assigns[:hide_email] %>
+      <%=
+        f.email_field(
+            :email,
+            size:        nil,
+            maxlength:   FeedbackRequest::EMAIL_LIMIT,
+            placeholder: t('activerecord.attributes.feedback_request.email'),
+            aria:        {
+                label: t('activerecord.attributes.feedback_request.email')
+            },
+            required:    true
+        )
+      %>
+    <% end %>
+    <% unless local_assigns[:hide_comment] %>
       <%= f.text_area(
               :comment,
               cols:        20,
@@ -48,9 +55,13 @@
           )
       %>
     <% end %>
-    <%= hidden_field_tag 'form_id', form_id %>
+    <div>
+      <%= f.check_box :consent, id: :feedback_request_consent %>
+      <%= f.label :consent %>
+    </div>
   </div>
   <div class="buttons">
+    <%= hidden_field_tag 'form_id', form_id %>
     <%= button_tag(t(:submit), type: :submit) %>
   </div>
 

data/app/views/my/profiles/check.jbuilder

@@ -0,0 +1,4 @@
+json.meta do
+  json.valid @entity.valid?
+  json.errors @entity.errors
+end

data/app/views/my/profiles/new/_form.html.erb

@@ -1,11 +1,12 @@
+<% model_name = entity.class.to_s.underscore %>
 <%=
   form_with(
       model: entity,
-      scope: 'user',
+      scope: model_name,
       url:   my_profile_path,
       class: 'new-my-profile',
-      id:    'user-form',
-      data:  { check_url: check_users_path }
+      id:    "#{model_name}-form",
+      data:  { check_url: check_my_profile_path }
   ) do |f|
 %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
@@ -17,7 +18,7 @@
       <%=
         f.text_field(
             :screen_name,
-            id:        :user_screen_name,
+            id:        "#{model_name}_screen_name",
             required:  true,
             maxlength: User::SCREEN_NAME_LIMIT,
             pattern:   User::SCREEN_NAME_PATTERN_HTML,
@@ -36,7 +37,7 @@
       <%=
         f.password_field(
             :password,
-            id:        :user_password,
+            id:        "#{model_name}_password",
             required:  true,
             size:      nil,
             maxlength: 70,
@@ -54,7 +55,7 @@
       <%=
         f.password_field(
             :password_confirmation,
-            id:        :user_password_confirmation,
+            id:        "#{model_name}_password_confirmation",
             required:  true,
             size:      nil,
             maxlength: 70,
@@ -72,7 +73,7 @@
       <%=
         f.email_field(
             :email,
-            id:        :user_email,
+            id:        "#{model_name}_email",
             size:      nil,
             maxlength: User::EMAIL_LIMIT,
             required:  true,
@@ -86,8 +87,8 @@
 
   <ul class="flags">
     <li>
-      <%= check_box_tag 'user[consent]', '1', false, required: true %>
-      <%= label_tag :user_consent, t('.consent') %>
+      <%= f.check_box :consent, id: "#{model_name}_consent", required: true %>
+      <%= f.label :consent, t('.consent') %>
     </li>
     <li>
       <%= f.check_box :allow_mail, id: :user_allow_mail %>
@@ -95,7 +96,7 @@
     </li>
   </ul>
 
-  <div class="trap">
+  <div class="visually-hidden">
     <%= check_box_tag :agree, '1', false, tabindex: '-1' %>
     <%= label_tag :agree, t('.i_am_bot') %>
   </div>

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

@@ -1,20 +1,34 @@
-<meta property="og:title" content="<%= content_for :meta_title %>" />
-<meta property="og:type" content="<%= content_for?(:meta_type) ? (yield :meta_type) : 'website' %>" />
-<meta property="og:url" content="<%= url_for(only_path: false) %>" />
-<%= yield :meta_type_extension if content_for? :meta_type_extension %>
-<% if content_for? :meta_image %>
-    <meta property="og:image" content="<%= yield :meta_image %>" />
-    <meta name="twitter:image" content="<%= yield :meta_image %>" />
-<% end %>
 <% if content_for? :meta_description %>
-    <meta name="description" content="<%= yield :meta_description %>" />
-    <meta property="og:description" content="<%= yield :meta_description %>" />
+  <meta name="description" content="<%= yield :meta_description %>" />
 <% end %>
 <% if content_for? :meta_keywords %>
   <meta name="keywords" content="<%= yield :meta_keywords %>" />
 <% end %>
 <meta property="og:site_name" content="<%= t('.site_name') %>" />
-<meta property="twitter:title" content="<%= content_for :meta_title %>" />
+<% if content_for? :meta_opengraph %>
+  <%= yield :meta_opengraph %>
+<% else %>
+  <meta property="og:url" content="<%= url_for(only_path: false) %>" />
+  <meta property="og:title" content="<%= content_for :meta_title %>" />
+  <meta property="og:type" content="<%= content_for?(:meta_type) ? (yield :meta_type) : 'website' %>" />
+  <% if content_for? :meta_image %>
+    <meta property="og:image" content="<%= yield :meta_image %>" />
+    <% if content_for? :meta_image_alt %>
+      <meta property="og:image:alt" content="<%= yield :meta_image_alt %>" />
+    <% end %>
+  <% end %>
+  <%= yield :meta_type_extension if content_for? :meta_type_extension %>
+  <% if content_for? :meta_description %>
+    <meta property="og:description" content="<%= yield :meta_description %>" />
+  <% end %>
+<% end %>
+<% if content_for? :meta_twitter %>
+  <%= yield :meta_twitter %>
+<% else %>
+  <meta property="twitter:title" content="<%= content_for :meta_title %>" />
+  <% if content_for? :meta_image %>
+    <meta name="twitter:image" content="<%= yield :meta_image %>" />
+  <% end %>
+<% end %>
 <meta name="twitter:site" content="<%= t('.twitter_site') %>" />
 <meta name="twitter:creator" content="<%= t('.twitter_creator') %>" />
-<%= yield :meta_twitter if content_for? :meta_twitter %>

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

@@ -0,0 +1,11 @@
+<dt><%= t(:flags) %></dt>
+<dd>
+  <ul class="flags">
+    <% entity.class.toggleable_attributes.each do |flag| %>
+      <li>
+        <%= f.check_box flag, id: "#{model_name}_flag" %>
+        <%= f.label flag %>
+      </li>
+    <% end %>
+  </ul>
+</dd>

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

@@ -1,4 +1,4 @@
-<script src="//cdn.ckeditor.com/4.8.0/full/ckeditor.js"></script>
+<script src="//cdn.ckeditor.com/4.9.2/standard/ckeditor.js"></script>
 <script>
     document.addEventListener('DOMContentLoaded', function () {
         document.querySelectorAll('form [data-wysiwyg]').forEach(function(editor) {

data/app/views/shared/forms/check.jbuilder

@@ -0,0 +1,4 @@
+json.meta do
+  json.valid @entity.valid?
+  json.errors @entity.errors
+end

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

@@ -1,19 +1,19 @@
-<% entity_type = entity.class.to_s.underscore %>
-<%= form_with(model: entity, html: { id: "#{entity_type}-form" }) do |f| %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
   <dl>
     <dt><%= f.label :image %></dt>
     <dd>
-      <figure id="<%= entity_type %>-image" role="group" class="preview">
+      <figure id="<%= model_name %>-image" role="group" class="preview">
         <%= f.label(:image, image_tag(entity.image.profile.url)) %>
         <figcaption>
           <%=
             f.file_field(
                 :image,
-                id:     :user_image,
+                id:     "#{model_name}_image",
                 accept: 'image/jpeg,image/png',
-                data:   { image: "#{entity_type}-image" }
+                data:   { image: "#{model_name}-image" }
             )
           %>
         </figcaption>
@@ -25,6 +25,7 @@
       <%=
         f.text_field(
             :screen_name,
+            id:        "#{model_name}_screen_name",
             maxlength: User::SCREEN_NAME_LIMIT,
             pattern:   User::SCREEN_NAME_PATTERN_HTML,
             title:     t('.guidelines.screen_name'),
@@ -39,10 +40,10 @@
       <%=
         f.email_field(
             :email,
-            id:        :user_email,
+            id:        "#{model_name}_email",
             size:      nil,
             maxlength: User::EMAIL_LIMIT,
-            readonly: entity.super_user?
+            readonly:  entity.super_user?
         )
       %>
     </dd>
@@ -52,10 +53,21 @@
       <%=
         f.phone_field(
             :phone,
-            id:        :user_phone,
+            id:        "#{model_name}_phone",
             size:      15,
             maxlength: User::PHONE_LIMIT,
-            readonly: entity.super_user?
+            readonly:  entity.super_user?
+        )
+      %>
+    </dd>
+
+    <dt><%= f.label :balance %></dt>
+    <dd>
+      <%=
+        f.number_field(
+            :balance,
+            id: "#{model_name}_balance",
+            size: 7
         )
       %>
     </dd>
@@ -65,7 +77,7 @@
       <%=
         f.date_field(
             :birthday,
-            id:   :user_birthday,
+            id:   "#{model_name}_birthday",
             size: 10
         )
       %>
@@ -77,7 +89,7 @@
         <%=
           f.text_field(
               :password,
-              id:        :user_password,
+              id:        "#{model_name}_password",
               size:      nil,
               maxlength: 70,
               required:  entity.id.nil?
@@ -90,7 +102,7 @@
         <%=
           f.text_field(
               :password_confirmation,
-              id:        :user_password_confirmation,
+              id:        "#{model_name}_password_confirmation",
               size:      nil,
               maxlength: 70,
               required:  entity.id.nil?
@@ -106,39 +118,20 @@
       <%=
         f.text_field(
             :notice,
-            id: :user_notice,
-            size: nil,
+            id:        "#{model_name}_notice",
+            size:      nil,
             maxlength: User::NOTICE_LIMIT
         )
       %>
       <div class="guideline"><%= t('.guidelines.notice') %></div>
     </dd>
 
-    <dt><%= t(:flags) %></dt>
-    <dd>
-      <ul>
-        <li>
-          <%= f.check_box :bot, id: :user_bot %>
-          <%= f.label :bot %>
-        </li>
-        <li>
-          <%= f.check_box :allow_login, id: :user_allow_login %>
-          <%= f.label :allow_login %>
-        </li>
-        <li>
-          <%= f.check_box :email_confirmed, id: :user_email_confirmed %>
-          <%= f.label :email_confirmed %>
-        </li>
-        <li>
-          <%= f.check_box :phone_confirmed, id: :user_phone_confirmed %>
-          <%= f.label :phone_confirmed %>
-        </li>
-        <li>
-          <%= f.check_box :allow_mail, id: :user_allow_mail %>
-          <%= f.label :allow_mail %>
-        </li>
-      </ul>
-    </dd>
+    <%=
+      render(
+          partial: 'shared/forms/entity_flags',
+          locals: { f: f, entity: entity, model_name: model_name }
+      )
+    %>
   </dl>
 
   <div class="buttons">

data/config/locales/common-en.yml

@@ -151,12 +151,14 @@ en:
       footer:
         support: "Support"
   about:
-    index:
-      nav_text: "About us"
-    tos:
-      nav_text: "Terms of service"
+    contact:
+      nav_text: "Contact"
     editable:
       title: "In progress"
       heading: "Content is not ready"
       message: "Page content is not ready, please come back later."
+    index:
+      nav_text: "About us"
+    tos:
+      nav_text: "Terms of service"
   total: "Total"

data/config/locales/common-ru.yml

@@ -15,6 +15,7 @@ ru:
   errors:
     messages:
       extension_blacklist_error: "имеет недопустимое расширение файла"
+      extension_whitelist_error: "имеет недопустимое расширение файла"
     error:
       bad_request:
         title: "Плохой запрос"
@@ -151,12 +152,14 @@ ru:
       footer:
         support: "Поддержка"
   about:
-    index:
-      nav_text: "О проекте"
-    tos:
-      nav_text: "Пользовательское соглашение"
+    contact:
+      nav_text: "Контакты"
     editable:
       title: "Раздел в разработке"
       heading: "Раздел наполняется"
       message: "Информация ещё не готова, зайдите позже"
+    index:
+      nav_text: "О проекте"
+    tos:
+      nav_text: "Пользовательское соглашение"
   total: "Всего"

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

@@ -8,12 +8,16 @@ ru:
         body: "Содержимое"
         description: "Метаописание"
         image: "Картинка"
+        image_alt_text: "Текст для атрибута alt для картинки"
         keywords: "Ключевые слова"
         language: "Язык"
         language_id: "Язык"
         name: "Название"
+        nav_group: "Название группы навигации"
+        priority: "Порядок сортировки"
         slug: "Идентификатор"
         title: "Заголовок"
+        url: "URL для страницы"
       stored_value:
         description: "Описание"
         name: "Название"
@@ -51,13 +55,17 @@ ru:
       success: "Редактируемая страница успешно удалена"
     form:
       guidelines:
+        body: "HTML для вставки внутри сайта. Максимум 64кБ текста."
+        description: "Метаописание для поисковых роботов, результатов поиска и расшаривания. Максимум 250 символов."
         image: "Картинка в формате JPG или PNG размером около 640×640 для иллюстрации при расшаривании."
-        slug: "Используется для вставки внутри сайта. Максимум 100 символов."
+        image_alt_text: "Максимум 250 символов."
+        keywords: "Значение для meta keywords (для поисковых роботов). Максимум 250 символов."
         name: "Внутреннее название для удобства. Максимум 100 символов."
         title: "Будет отображаться в заголовке окна. Максимум 250 символов."
-        keywords: "Значение для meta keywords (для поисковых роботов). Максимум 250 символов."
-        description: "Метаописание для поисковых роботов, результатов поиска и расшаривания. Максимум 250 символов."
-        body: "HTML для вставки внутри сайта. Максимум 64кБ текста."
+        slug: "Используется для вставки внутри сайта. Максимум 100 символов."
+        url: "Абсолютный путь"
+      placeholders:
+        url: "/about/editable-pages"
   stored_values:
     new:
       heading: "Новое хранимое значение"